fix(index): use counters instead of index from snapshotState to keep …

…track of snapshot index
americanexpress · Jun 26, 2017 · c34d432 · c34d432
1 parent 2d919c1
commit c34d432
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/__tests__/src/__snapshots__/index.spec.js.snap b/__tests__/src/__snapshots__/index.spec.js.snap
@@ -10,12 +10,12 @@ Object {
 }
 `;
 
-exports[`toMatchImageSnapshot should fail when diff result is unknown 1`] = `
+exports[`toMatchImageSnapshot should fail when diff result is unknown 2`] = `
 "Expected image to match or be a close match to snapshot.
 [1m[31mSee diff for details:[39m[22m [31mpath/to/result.png[39m"
 `;
 
-exports[`toMatchImageSnapshot should fail when snapshot has a difference beyond allowed threshold 1`] = `
+exports[`toMatchImageSnapshot should fail when snapshot has a difference beyond allowed threshold 2`] = `
 "Expected image to match or be a close match to snapshot.
 [1m[31mSee diff for details:[39m[22m [31mpath/to/result.png[39m"
 `;

diff --git a/__tests__/src/index.spec.js b/__tests__/src/index.spec.js
@@ -74,7 +74,7 @@ describe('toMatchImageSnapshot', () => {
       currentTestName: 'test1',
       isNot: false,
       snapshotState: {
-        _index: 0,
+        _counters: new Map(),
         _updateSnapshot: 'none',
         updated: undefined,
         added: true,
@@ -98,7 +98,7 @@ describe('toMatchImageSnapshot', () => {
       currentTestName: 'test',
       isNot: false,
       snapshotState: {
-        _index: 0,
+        _counters: new Map(),
         _updateSnapshot: 'none',
         updated: undefined,
         added: true,
@@ -122,7 +122,7 @@ describe('toMatchImageSnapshot', () => {
       currentTestName: 'test',
       isNot: false,
       snapshotState: {
-        _index: 0,
+        _counters: new Map(),
         _updateSnapshot: 'none',
         updated: undefined,
         added: true,
@@ -146,7 +146,7 @@ describe('toMatchImageSnapshot', () => {
       currentTestName: 'test1',
       isNot: false,
       snapshotState: {
-        _index: 0,
+        _counters: new Map(),
         _updateSnapshot: 'all',
         updated: undefined,
         added: true,
@@ -170,7 +170,7 @@ describe('toMatchImageSnapshot', () => {
       currentTestName: 'test1',
       isNot: false,
       snapshotState: {
-        _index: 0,
+        _counters: new Map(),
         update: false,
         updated: undefined,
         added: true,
@@ -190,7 +190,7 @@ describe('toMatchImageSnapshot', () => {
       currentTestName: 'test1',
       isNot: false,
       snapshotState: {
-        _index: 0,
+        _counters: new Map(),
         update: true,
         updated: undefined,
         added: undefined,

diff --git a/src/index.js b/src/index.js
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-
+/* eslint-disable no-underscore-dangle */
 const kebabCase = require('lodash/kebabCase');
 const merge = require('lodash/merge');
 const path = require('path');
@@ -27,18 +27,14 @@ function toMatchImageSnapshot(received, { customSnapshotIdentifier = '', customD
   let { snapshotState } = this;
   if (isNot) { throw new Error('Jest: `.not` cannot be used with `.toMatchImageSnapshot()`.'); }
 
-  updateSnapshotState(
-    snapshotState, { _index: snapshotState._index += 1 } // eslint-disable-line no-underscore-dangle
-  );
-
-  // eslint-disable-next-line no-underscore-dangle
-  const snapshotIdentifier = customSnapshotIdentifier || kebabCase(`${path.basename(testPath)}-${currentTestName}-${snapshotState._index}`);
+  updateSnapshotState(snapshotState, { _counters: snapshotState._counters.set(currentTestName, (snapshotState._counters.get(currentTestName) || 0) + 1) }); // eslint-disable-line max-len
+  const snapshotIdentifier = customSnapshotIdentifier || kebabCase(`${path.basename(testPath)}-${currentTestName}-${snapshotState._counters.get(currentTestName)}`);
 
   const result = diffImageToSnapshot({
     imageData: received,
     snapshotIdentifier,
     snapshotsDir: path.join(path.dirname(testPath), '__image_snapshots__'),
-    updateSnapshot: snapshotState._updateSnapshot === 'all', // eslint-disable-line no-underscore-dangle
+    updateSnapshot: snapshotState._updateSnapshot === 'all',
     customDiffConfig,
   });
   let pass = true;