Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle arrays when merging snapshots #7089

Merged
merged 10 commits into from Apr 22, 2019
Merged

Handle arrays when merging snapshots #7089

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6534d09
add support for arrays when merging snapshots
timtrinidad Oct 2, 2018
4fb1c1a
update README
timtrinidad Oct 2, 2018
079fa50
compare array by keys without converting to object
timtrinidad Dec 3, 2018
7317c0d
add support for arrays when merging snapshots
timtrinidad Oct 2, 2018
ac1974c
update README
timtrinidad Oct 2, 2018
1942422
compare array by keys without converting to object
timtrinidad Dec 3, 2018
bf0534b
Merge branch 'master' of github.com:timtrinidad/jest
timtrinidad Apr 22, 2019
a22721f
jest-snapshot: fix ts errors in utils
timtrinidad Apr 22, 2019
1dada66
jest-snapshot: use assert.deepStrictEqual to allow expect.any(String)…
timtrinidad Apr 22, 2019
0926357
jest-snapshot: add test for more array elements in source than target
timtrinidad Apr 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion packages/jest-snapshot/src/__tests__/utils.test.ts
View file
Open in desktop
Expand Up @@ -9,8 +9,8 @@ jest.mock('fs');

import fs from 'fs';
import path from 'path';
import chalk from 'chalk';
import assert from 'assert';
import chalk from 'chalk';

import {
deepMerge,
Expand Down Expand Up @@ -219,6 +219,7 @@ describe('DeepMerge', () => {
seven: 'seven',
},
],
eight: [{nine: 'nine'}],
},
};

Expand All @@ -231,6 +232,11 @@ describe('DeepMerge', () => {
four: matcher,
},
],
eight: [
{nine: matcher},
// Include an array element not present in the target
{ten: matcher},
],
},
};

Expand All @@ -253,6 +259,7 @@ describe('DeepMerge', () => {
seven: 'seven',
},
],
eight: [{nine: matcher}, {ten: matcher}],
},
});

Expand All @@ -271,6 +278,7 @@ describe('DeepMerge', () => {
seven: 'seven',
},
],
eight: [{nine: 'nine'}],
},
});
/* eslint-enable sort-keys */
Expand Down
2 changes: 0 additions & 2 deletions packages/jest-snapshot/src/utils.ts
View file
Open in desktop
Expand Up @@ -185,8 +185,6 @@ const deepMergeArray = (target: Array<any>, source: Array<any>) => {
source.forEach((element, index) => {
if (typeof mergedOutput[index] === 'undefined') {
mergedOutput[index] = element;
} else if (typeof element === 'undefined') {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In adding tests to cover this line, I realized that this case really shouldn't happen (i.e. source having an array element that's undefined)

mergedOutput.push(target[index]);
} else {
mergedOutput[index] = deepMerge(target[index], element);
}
Expand Down