Try image-difference (#28)

* Try image-difference * remove image-diff and fix package name * Add es2017 * Fix prop name * Use image-diffrence@2.0.7
reg-viz · Jul 7, 2017 · 0e07428 · 0e07428
1 parent 5eb8f0f
commit 0e07428
Show file tree

Hide file tree

Showing 5 changed files with 227 additions and 323 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,6 +1,6 @@
 {
-  "presets": ["es2015", "es2016", "stage-2"],
+  "presets": ["es2015", "es2016", "es2017", "stage-2"],
   "plugins": [
-    "babel-plugin-transform-flow-strip-types",
-  ],
-}
+    "babel-plugin-transform-flow-strip-types"
+  ]
+}
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "chalk": "^1.1.3",
     "cli-spinner": "^0.2.6",
     "glob": "^7.1.1",
-    "image-diff": "^1.6.3",
+    "image-difference": "^2.0.7",
     "lodash": "^4.17.4",
     "make-dir": "^1.0.0",
     "md5-file": "^3.1.1",
@@ -38,6 +38,7 @@
     "babel-plugin-transform-flow-strip-types": "^6.22.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-es2016": "^6.24.1",
+    "babel-preset-es2017": "^6.24.1",
     "babel-preset-stage-2": "^6.24.1",
     "copyfiles": "^1.2.0",
     "css-loader": "^0.28.2",

diff --git a/src/index.js b/src/index.js
@@ -1,6 +1,6 @@
 /* @flow */
 
-const imageDiff = require('image-diff');
+const imageDifference = require('image-difference').default;
 const { Spinner } = require('cli-spinner');
 const glob = require('glob'); // $FlowIgnore
 const mkdirp = require('make-dir'); // $FlowIgnore
@@ -54,20 +54,19 @@ const compareAndCreateDiff = ({ actualDir, expectedDir, diffDir, image, threshol
     if (actualHash === expectedHash) {
       return Promise.resolve({ passed: true, image });
     }
-    return new Promise((resolve, reject) => {
-      imageDiff.getFullResult({
-        actualImage: `${actualDir}${image}`,
-        expectedImage: `${expectedDir}${image}`,
-        diffImage: `${diffDir}${image}`,
-        shadow: true,
-      }, (err, result) => {
-        if (err) {
-          reject(err);
-        }
+    return imageDifference({
+      actualFilename: `${actualDir}${image}`,
+      expectedFilename: `${expectedDir}${image}`,
+      diffFilename: `${diffDir}${image}`,
+      // metric: 'RMSE',
+    })
+      .then((result) => {
         const passed = result.percentage <= threshold;
-        resolve({ passed, image });
+        return { passed, image };
+      })
+      .catch((e) => {
+        reject(e);
       })
-    })
   })
 };
 

diff --git a/test/test.js b/test/test.js
@@ -14,14 +14,14 @@ test.beforeEach(async t => {
   await new Promise((resolve) => copyfiles([`${RESOURCE}${IMAGE_FILES}`, WORKSPACE], resolve));
 })
 
-test('should display error message when passing only 1 argument', async t => {
+test.serial('should display error message when passing only 1 argument', async t => {
   const stdout = await new Promise((resolve) => {
     execFile('./dist/cli.js', ['./sample/actual'], (error, stdout) => resolve(stdout));
   })
   t.true(stdout.indexOf('please specify actual, expected and diff images directory') !== -1);
 });
 
-test('should display error message when passing only 2 argument', async t => {
+test.serial('should display error message when passing only 2 argument', async t => {
   const stdout = await new Promise((resolve) => {
     execFile('./dist/cli.js', ['./sample/actual', './sample/expected'], (error, stdout) => resolve(stdout));
   })
@@ -45,6 +45,7 @@ test.serial('should generate image diff and output fail message', async t => {
     fs.readFileSync(`${WORKSPACE}/diff/${SAMPLE_IMAGE}`);
     t.pass();
   } catch (e) {
+    console.log(e)
     t.fail();
   }
 });
@@ -202,3 +203,4 @@ test.serial('should generate success report', async t => {
 test.afterEach.always(async t => {
   await new Promise((done) => rimraf(`${WORKSPACE}${IMAGE_FILES}`, done));
 });
+