Merge pull request #438 from gemini-testing/feat/rm.gemini-core

feat: use looks-same directly instead of gemini-core.Image wrapper

Author: j0tunn

lib/gui/tool-runner/index.js

@@ -18,14 +18,6 @@ const {DATABASE_URLS_JSON_NAME, LOCAL_DATABASE_NAME} = require('../../constants/
 const {formatId, getShortMD5, mkFullTitle, mergeDatabasesForReuse, filterByEqualDiffSizes} = require('./utils');
 const {getTestsTreeFromDatabase} = require('../../db-utils/server');
 
-const lookSameAsync = (img1, img2, opts) => {
-    return new Promise((resolve, reject) => {
-        looksSame(img1, img2, opts, (err, data) => {
-            err ? reject(err) : resolve(data);
-        });
-    });
-};
-
 module.exports = class ToolRunner {
     static create(paths, hermione, configs) {
         return new this(paths, hermione, configs);
@@ -135,7 +127,7 @@ module.exports = class ToolRunner {
         const equalImages = await Promise.filter(comparedImages, async (image) => {
             try {
                 await Promise.mapSeries(image.diffClusters, async (diffCluster, i) => {
-                    const refComparisonRes = await lookSameAsync(
+                    const refComparisonRes = await looksSame(
                         {source: this._resolveImgPath(selectedImage.expectedImg.path), boundingBox: selectedImage.diffClusters[i]},
                         {source: this._resolveImgPath(image.expectedImg.path), boundingBox: diffCluster},
                         compareOpts
@@ -145,7 +137,7 @@ module.exports = class ToolRunner {
                         return Promise.reject(false);
                     }
 
-                    const actComparisonRes = await lookSameAsync(
+                    const actComparisonRes = await looksSame(
                         {source: this._resolveImgPath(selectedImage.actualImg.path), boundingBox: selectedImage.diffClusters[i]},
                         {source: this._resolveImgPath(image.actualImg.path), boundingBox: diffCluster},
                         compareOpts

lib/test-adapter.js

@@ -377,7 +377,7 @@ module.exports = class TestAdapter {
         return result;
     }
 
-    //parallelize and cache of 'gemini-core.Image.buildDiff' (because it is very slow)
+    //parallelize and cache of 'looks-same.createDiff' (because it is very slow)
     async _saveDiffInWorker(imageDiffError, destPath, workers, cacheDiffImages = globalCacheDiffImages) {
         await utils.makeDirFor(destPath);
 

lib/workers/worker.js

@@ -1,13 +1,15 @@
 'use strict';
 
-const {Image} = require('gemini-core');
+const looksSame = require('looks-same');
 
 module.exports = {
     /**
      * @param {Object} imageDiffError
      * @param {String} diffPath
      */
     saveDiffTo: function(imageDiffError, diffPath) {
-        return Image.buildDiff({diff: diffPath, ...imageDiffError.diffOpts});
+        const {diffColor: highlightColor, ...otherOpts} = imageDiffError.diffOpts;
+
+        return looksSame.createDiff({diff: diffPath, highlightColor, ...otherOpts});
     }
 };