mirrors/axios
2
0
Fork 0
mirror of https://github.com/tenrok/axios.git synced 2026-06-11 18:02:32 +03:00
Code Activity

Fix merging of params (#2656)

Browse Source 
* Name function to avoid ESLint func-names warning

* Switch params config to merge list and update tests

* Restore testing of both false and null

* Restore test cases for keys without defaults

* Include test for non-object values that aren't false-y.
This commit is contained in:
Jonathan Sharpe
2020-02-15 05:36:52 +00:00
committed by GitHub
parent 371d8eac79
commit 77f0ae4f61
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/specs/core/mergeConfig.spec.js
+16 -14
View File
@@ -33,30 +33,32 @@ describe('core::mergeConfig', function() {
it('should not inherit request options', function() {
var localDefaults = {
method: '__sample method__',
params: '__sample params__',
data: { foo: true }
};
var merged = mergeConfig(localDefaults, {});
expect(merged.method).toEqual(undefined);
expect(merged.params).toEqual(undefined);
expect(merged.data).toEqual(undefined);
});
it('should merge auth, headers, proxy with defaults', function() {
expect(mergeConfig({ auth: undefined }, { auth: { user: 'foo', pass: 'test' } })).toEqual({
auth: { user: 'foo', pass: 'test' }
['auth', 'headers', 'params', 'proxy'].forEach(key => {
it(`should set new config for ${key} without default`, function() {
expect(mergeConfig({ [key]: undefined }, { [key]: { user: 'foo', pass: 'test' } })).toEqual({
[key]: { user: 'foo', pass: 'test' }
});
});
expect(mergeConfig({ auth: { user: 'foo', pass: 'test' } }, { auth: { pass: 'foobar' } })).toEqual({
auth: { user: 'foo', pass: 'foobar' }
});
});
it('should overwrite auth, headers, proxy with a non-object value', function() {
expect(mergeConfig({ auth: { user: 'foo', pass: 'test' } }, { auth: false })).toEqual({
auth: false
it(`should merge ${key} with defaults`, function() {
expect(mergeConfig({ [key]: { user: 'foo', pass: 'bar' } }, { [key]: { pass: 'test' } })).toEqual({
[key]: { user: 'foo', pass: 'test' }
});
});
expect(mergeConfig({ auth: { user: 'foo', pass: 'test' } }, { auth: null })).toEqual({
auth: null
it(`should overwrite default ${key} with a non-object value`, function() {
[false, null, 123].forEach(value => {
expect(mergeConfig({ [key]: { user: 'foo', pass: 'test' } }, { [key]: value })).toEqual({
[key]: value
});
});
});
});