fix: set actual path to image for update-reference handler

gemini-testing · Apr 10, 2018 · 6c17994 · 6c17994
1 parent 4c1da22
commit 6c17994
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/lib/gui/tool-runner-factory/gemini/index.js b/lib/gui/tool-runner-factory/gemini/index.js
@@ -68,15 +68,15 @@ module.exports = class GeminiRunner extends BaseToolRunner {
         const searchBy = _.pick(test, ['suite', 'state', 'browserId']);
         const currentState = _.find(this._collectionStates, searchBy);
         const imagePath = this._tool.getScreenshotPath(currentState.suite, test.state.name, test.browserId);
-        const {metaInfo: {sessionId, url: fullUrl}, attempt} = test;
+        const {metaInfo: {sessionId, url: fullUrl}, attempt, actualPath} = test;
 
         const testResult = {
             suite: _.pick(currentState.suite, ['name', 'path', 'url']),
             state: _.pick(currentState.state, 'name'),
             browserId: currentState.browserId
         };
 
-        return _.merge(testResult, {imagePath, sessionId, attempt, suite: {fullUrl}, updated: true});
+        return _.merge(testResult, {imagePath, sessionId, attempt, actualPath, suite: {fullUrl}, updated: true});
     }
 };
 

diff --git a/lib/gui/tool-runner-factory/gemini/report-subscriber.js b/lib/gui/tool-runner-factory/gemini/report-subscriber.js
@@ -64,7 +64,7 @@ module.exports = (gemini, reportBuilder, client, reportPath) => {
         const result = reportBuilder.addUpdated(data);
         const testResult = prepareTestResult(data);
 
-        updateReferenceImage(result, reportPath)
+        updateReferenceImage(_.extend(result, {actualPath: data.actualPath}), reportPath)
             .then(() => client.emit(clientEvents.UPDATE_RESULT, testResult));
     });
 

diff --git a/lib/gui/tool-runner-factory/hermione/index.js b/lib/gui/tool-runner-factory/hermione/index.js
@@ -55,7 +55,7 @@ module.exports = class HermioneRunner extends BaseToolRunner {
     }
 
     _prepareUpdateResult(test) {
-        const {suite, state, browserId, attempt} = test;
+        const {suite, state, browserId, attempt, actualPath} = test;
 
         // https://github.com/mochajs/mocha/blob/v2.4.5/lib/runnable.js#L165
         const fullTitle = `${suite.path.join(' ')} ${state.name}`;
@@ -65,7 +65,7 @@ module.exports = class HermioneRunner extends BaseToolRunner {
         const {sessionId, url} = test.metaInfo;
         const imagePath = this._tool.config.browsers[browserId].getScreenshotPath(testResult, test.assertViewState);
 
-        return _.merge({}, testResult, {imagePath, sessionId, attempt, meta: {url}, updated: true});
+        return _.merge({}, testResult, {imagePath, sessionId, attempt, actualPath, meta: {url}, updated: true});
     }
 };
 

diff --git a/lib/gui/tool-runner-factory/hermione/report-subscriber.js b/lib/gui/tool-runner-factory/hermione/report-subscriber.js
@@ -67,7 +67,7 @@ module.exports = (hermione, reportBuilder, client, reportPath) => {
         const result = reportBuilder.addUpdated(data);
         const testResult = prepareTestResult(data);
 
-        updateReferenceImage(result, reportPath)
+        updateReferenceImage(_.extend(result, {actualPath: data.actualPath}), reportPath)
             .then(() => client.emit(clientEvents.UPDATE_RESULT, testResult));
     });
 

diff --git a/lib/reporter-helpers.js b/lib/reporter-helpers.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const path = require('path');
 const fs = require('fs-extra');
 const utils = require('./server-utils');
 
@@ -33,7 +34,9 @@ exports.saveTestCurrentImage = (testResult, reportPath) => {
 };
 
 exports.updateReferenceImage = (testResult, reportPath) => {
-    const src = utils.getCurrentAbsolutePath(testResult, reportPath);
+    const src = testResult.actualPath
+        ? path.resolve(reportPath, testResult.actualPath)
+        : utils.getCurrentAbsolutePath(testResult, reportPath);
 
     return Promise.all([
         utils.copyImageAsync(src, testResult.imagePath),

diff --git a/lib/static/modules/actions.js b/lib/static/modules/actions.js
@@ -114,6 +114,10 @@ function formatTests(test) {
     const {suitePath, name, acceptTestAttempt} = test;
 
     return flatMap(test.browsers, (browser) => {
+        const {actualPath} = acceptTestAttempt >= 0
+            ? browser.retries.concat(browser.result)[acceptTestAttempt]
+            : browser.result;
+
         const {metaInfo, assertViewState, attempt} = browser.result;
 
         return {
@@ -122,7 +126,8 @@ function formatTests(test) {
             browserId: browser.name,
             metaInfo,
             assertViewState,
-            attempt: acceptTestAttempt >= 0 ? acceptTestAttempt : attempt
+            attempt,
+            actualPath
         };
     });
 }