From ad5e30e18963c07fc3fd8e6cef10fd5b07bd12d8 Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Fri, 19 Feb 2016 08:17:44 -0800 Subject: [PATCH] Move `_.merge` test for augmenting objects. --- test/test.js | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/test/test.js b/test/test.js index 7e02f45d9..09607700c 100644 --- a/test/test.js +++ b/test/test.js @@ -14028,26 +14028,6 @@ assert.deepEqual(actual, expected); }); - QUnit.test('should not augment source objects', function(assert) { - assert.expect(6); - - var source1 = { 'a': [{ 'a': 1 }] }, - source2 = { 'a': [{ 'b': 2 }] }, - actual = _.merge({}, source1, source2); - - assert.deepEqual(source1.a, [{ 'a': 1 }]); - assert.deepEqual(source2.a, [{ 'b': 2 }]); - assert.deepEqual(actual.a, [{ 'a': 1, 'b': 2 }]); - - var source1 = { 'a': [[1, 2, 3]] }, - source2 = { 'a': [[3, 4]] }, - actual = _.merge({}, source1, source2); - - assert.deepEqual(source1.a, [[1, 2, 3]]); - assert.deepEqual(source2.a, [[3, 4]]); - assert.deepEqual(actual.a, [[3, 4, 3]]); - }); - QUnit.test('should deep clone array/typed-array/plain-object sources', function(assert) { assert.expect(1); @@ -14074,6 +14054,26 @@ assert.deepEqual(actual, expected); }); + QUnit.test('should not augment source objects', function(assert) { + assert.expect(6); + + var source1 = { 'a': [{ 'a': 1 }] }, + source2 = { 'a': [{ 'b': 2 }] }, + actual = _.merge({}, source1, source2); + + assert.deepEqual(source1.a, [{ 'a': 1 }]); + assert.deepEqual(source2.a, [{ 'b': 2 }]); + assert.deepEqual(actual.a, [{ 'a': 1, 'b': 2 }]); + + var source1 = { 'a': [[1, 2, 3]] }, + source2 = { 'a': [[3, 4]] }, + actual = _.merge({}, source1, source2); + + assert.deepEqual(source1.a, [[1, 2, 3]]); + assert.deepEqual(source2.a, [[3, 4]]); + assert.deepEqual(actual.a, [[3, 4, 3]]); + }); + QUnit.test('should merge plain-objects onto non plain-objects', function(assert) { assert.expect(4);