From 2034c1db7eaac61fabd4319af2e9b4478d1d6b52 Mon Sep 17 00:00:00 2001 From: Xianming Zhong Date: Sat, 15 Feb 2020 15:54:43 +0800 Subject: [PATCH] Fix tests in browsers (#2748) --- test/specs/core/mergeConfig.spec.js | 37 ++++++++++++++++++----------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/test/specs/core/mergeConfig.spec.js b/test/specs/core/mergeConfig.spec.js index 6a92262..868bfb9 100644 --- a/test/specs/core/mergeConfig.spec.js +++ b/test/specs/core/mergeConfig.spec.js @@ -40,24 +40,33 @@ describe('core::mergeConfig', function() { expect(merged.data).toEqual(undefined); }); - ['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' } - }); + ['auth', 'headers', 'params', 'proxy'].forEach(function(key) { + it('should set new config for' + key + ' without default', function() { + var a = {}, b = {}, c = {} + a[key] = undefined + b[key] = { user: 'foo', pass: 'test' } + c[key] = { user: 'foo', pass: 'test' } + + expect(mergeConfig(a, b)).toEqual(c); }); - it(`should merge ${key} with defaults`, function() { - expect(mergeConfig({ [key]: { user: 'foo', pass: 'bar' } }, { [key]: { pass: 'test' } })).toEqual({ - [key]: { user: 'foo', pass: 'test' } - }); + it('should merge ' + key + ' with defaults', function() { + var a = {}, b = {}, c = {}; + a[key] = { user: 'foo', pass: 'bar' }; + b[key] = { pass: 'test' }; + c[key] = { user: 'foo', pass: 'test' }; + + expect(mergeConfig(a, b)).toEqual(c); }); - 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 - }); + it('should overwrite default ' + key + ' with a non-object value', function() { + [false, null, 123].forEach(function(value) { + var a = {}, b = {}, c = {}; + a[key] = { user: 'foo', pass: 'test' }; + b[key] = value; + c[key] = value; + + expect(mergeConfig(a, b)).toEqual(c); }); }); });