mirror of
https://github.com/tenrok/axios.git
synced 2026-06-20 20:00:40 +03:00
Refactor mergeConfig without utils.deepMerge (#2844)
* Adding failing test * Fixing #2587 default custom config persisting * Adding Concat keys and filter duplicates * Fixed value from CPE * update for review feedbacks * no deepMerge * only merge between plain objects * fix rename * always merge config by mergeConfig * extract function mergeDeepProperties * refactor mergeConfig with all keys, and add special logic for validateStatus * add test for resetting headers * add lots of tests and fix a bug * should not inherit `data` * use simple toString * revert #1845 Co-authored-by: David Tanner <david.tanner@lifeomic.com> Co-authored-by: Justin Beckwith <justin.beckwith@gmail.com>
This commit is contained in:
@@ -38,5 +38,47 @@ describe('utils::merge', function () {
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
it('should remove all references from nested objects', function () {
|
||||
var a = {foo: {bar: 123}};
|
||||
var b = {};
|
||||
var d = merge(a, b);
|
||||
|
||||
expect(d).toEqual({
|
||||
foo: {
|
||||
bar: 123
|
||||
}
|
||||
});
|
||||
|
||||
expect(d.foo).not.toBe(a.foo);
|
||||
});
|
||||
|
||||
it('handles null and undefined arguments', function () {
|
||||
expect(merge(undefined, undefined)).toEqual({});
|
||||
expect(merge(undefined, {foo: 123})).toEqual({foo: 123});
|
||||
expect(merge({foo: 123}, undefined)).toEqual({foo: 123});
|
||||
|
||||
expect(merge(null, null)).toEqual({});
|
||||
expect(merge(null, {foo: 123})).toEqual({foo: 123});
|
||||
expect(merge({foo: 123}, null)).toEqual({foo: 123});
|
||||
});
|
||||
|
||||
it('should replace properties with null', function () {
|
||||
expect(merge({}, {a: null})).toEqual({a: null});
|
||||
expect(merge({a: null}, {})).toEqual({a: null});
|
||||
});
|
||||
|
||||
it('should replace properties with arrays', function () {
|
||||
expect(merge({}, {a: [1, 2, 3]})).toEqual({a: [1, 2, 3]});
|
||||
expect(merge({a: 2}, {a: [1, 2, 3]})).toEqual({a: [1, 2, 3]});
|
||||
expect(merge({a: {b: 2}}, {a: [1, 2, 3]})).toEqual({a: [1, 2, 3]});
|
||||
});
|
||||
|
||||
it('should replace properties with cloned arrays', function () {
|
||||
var a = [1, 2, 3];
|
||||
var d = merge({}, {a: a});
|
||||
|
||||
expect(d).toEqual({a: [1, 2, 3]});
|
||||
expect(d.a).not.toBe(a);
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user