From 667d994b4be1bc4afb07de9c71c46450239bfc0a Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@salesforce.com>
Date: Tue, 26 Jun 2018 10:55:57 -0400
Subject: [PATCH 1/2] Replace previous testId suffix

Instead of continually appending new suffixes, replace the previous testId suffix with a new one.

Uses a `.` instead of a space so that we aren't introducing spaces into filenames where the user may not want them.
---
 src/target.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/target.js b/src/target.js
index 8995f68..1f812c4 100644
--- a/src/target.js
+++ b/src/target.js
@@ -215,9 +215,9 @@ export default class Target {
         ? `${this.testStats.currentTestName} ${this.testId}`
         : this.testStats.currentTestName;
     } else {
-      this.testConfig.testName = this.testId
-        ? `${this.testConfig.testName} ${this.testId}`
-        : this.testConfig.testName;
+      let previousTestSuffix = `.${(this.testId - 1)}`;
+      var re = new RegExp(previousTestSuffix, "g");
+      this.testConfig.testName = this.testId ? `${this.testConfig.testName.replace(re, '')}.${this.testId}` : this.testConfig.testName;
     }
     this.testId += 1;
     const result = await this._evaluateResult();

From e90cf0869296fcf063d6cfb126b99265dc29ac09 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@salesforce.com>
Date: Thu, 28 Jun 2018 11:16:27 -0400
Subject: [PATCH 2/2] tests to make sure images were named correctly

---
 src/integration.tests/integration.test.js | 72 +++++++++++++++++------
 1 file changed, 55 insertions(+), 17 deletions(-)

diff --git a/src/integration.tests/integration.test.js b/src/integration.tests/integration.test.js
index 7b01f4c..015c30b 100644
--- a/src/integration.tests/integration.test.js
+++ b/src/integration.tests/integration.test.js
@@ -143,20 +143,20 @@ describe('Differencify', () => {
       .init()
       .newPage()
       .tracing
-        .start({ path: 'trace.json' })
+      .start({ path: 'trace.json' })
       .page
-        .setViewport({ width: 1600, height: 1200 })
-        .goto('http://example.com/')
-        .waitFor(1000)
+      .setViewport({ width: 1600, height: 1200 })
+      .goto('http://example.com/')
+      .waitFor(1000)
       .keyboard
-        .press('Space')
+      .press('Space')
       .tracing
-        .stop()
+      .stop()
       .page
-        .screenshot()
-        .toMatchSnapshot()
-        .close()
-        .end();
+      .screenshot()
+      .toMatchSnapshot()
+      .close()
+      .end();
   }, 30000);
   it('Calling Puppeteer specific functions when chained: console', async () => {
     await differencify
@@ -189,11 +189,11 @@ describe('Differencify', () => {
       .newPage()
       .goto('http://example.com/')
       .mainFrame()
-        .then
-        .url()
-        .result((url) => {
-          expect(url).toEqual('http://example.com/');
-        })
+      .then
+      .url()
+      .result((url) => {
+        expect(url).toEqual('http://example.com/');
+      })
       .close()
       .end();
   }, 30000);
@@ -204,14 +204,52 @@ describe('Differencify', () => {
       .goto('http://example.com/')
       .waitFor(1000)
       .screenshot()
-      .toMatchSnapshot()
+      .toMatchSnapshot((resultDetail) => {
+        expect(resultDetail).toEqual({
+          testConfig: {
+            chain: true,
+            imageType: 'png',
+            isJest: true,
+            isUpdate: false,
+            testId: 11,
+            testName: 'Differencify Multiple toMatchSnapshot on chained object',
+            testNameProvided: false,
+            testPath: '/differencify/src/integration.tests/integration.test.js',
+          },
+          testResult: {
+            diffPercent: 0,
+            distance: 0,
+            matched: true,
+            snapshotPath: '/differencify/src/integration.tests/__image_snapshots__/Differencify Multiple toMatchSnapshot on chained object.1.snap.png',
+          },
+        })
+      })
       .result((result) => {
         expect(result).toEqual(true);
       })
       .goto('http://example.com/')
       .waitFor(1000)
       .screenshot()
-      .toMatchSnapshot()
+      .toMatchSnapshot((resultDetail) => {
+        expect(resultDetail).toEqual({
+          testConfig: {
+            chain: true,
+            imageType: 'png',
+            isJest: true,
+            isUpdate: false,
+            testId: 12,
+            testName: 'Differencify Multiple toMatchSnapshot on chained object',
+            testNameProvided: false,
+            testPath: '/differencify/src/integration.tests/integration.test.js',
+          },
+          testResult: {
+            diffPercent: 0,
+            distance: 0,
+            matched: true,
+            snapshotPath: '/differencify/src/integration.tests/__image_snapshots__/Differencify Multiple toMatchSnapshot on chained object.2.snap.png',
+          },
+        });
+      })
       .result((result) => {
         expect(result).toEqual(true);
       })