From c035a6885f883c1eeb7070e764599b50979e8add Mon Sep 17 00:00:00 2001 From: Zack Seuberling Date: Fri, 31 May 2019 15:31:35 -0700 Subject: [PATCH] Update tests Reading the docs makes it seems like params should merge --- test/specs/core/mergeConfig.spec.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/specs/core/mergeConfig.spec.js b/test/specs/core/mergeConfig.spec.js index bf6d2098c0..e3f15d27b2 100644 --- a/test/specs/core/mergeConfig.spec.js +++ b/test/specs/core/mergeConfig.spec.js @@ -20,7 +20,7 @@ describe('core::mergeConfig', function() { var config = { url: '__sample url__', method: '__sample method__', - params: '__sample params__', + params: { foo: true }, data: { foo: true } }; var merged = mergeConfig(defaults, config); @@ -34,23 +34,24 @@ describe('core::mergeConfig', function() { var localDefaults = { url: '__sample url__', method: '__sample method__', - params: '__sample params__', data: { foo: true } }; var merged = mergeConfig(localDefaults, {}); expect(merged.url).toEqual(undefined); expect(merged.method).toEqual(undefined); - expect(merged.params).toEqual(undefined); expect(merged.data).toEqual(undefined); }); - it('should merge auth, headers, proxy with defaults', function() { + it('should merge auth, headers, params, proxy with defaults', function() { expect(mergeConfig({ auth: undefined }, { auth: { user: 'foo', pass: 'test' } })).toEqual({ auth: { user: 'foo', pass: 'test' } }); expect(mergeConfig({ auth: { user: 'foo', pass: 'test' } }, { auth: { pass: 'foobar' } })).toEqual({ auth: { user: 'foo', pass: 'foobar' } }); + expect(mergeConfig({ params: { foo: 'test' } }, { params: { bar: 'baz' } })).toEqual({ + params: { foo: 'test', bar: 'baz' } + }); }); it('should overwrite auth, headers, proxy with a non-object value', function() {