fix(gui): accept all should not save errored tests

gemini-testing · Apr 6, 2018 · 811ec68 · 811ec68
1 parent 44bc01a
commit 811ec68
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 9 deletions.
diff --git a/lib/static/components/section/body.js b/lib/static/components/section/body.js
@@ -10,9 +10,7 @@ import ControlButton from '../controls/button';
 import State from '../state';
 import * as actions from '../../modules/actions';
 import {isSuccessStatus, isFailStatus, isErroredStatus} from '../../../common-utils';
-import {getCommonErrors} from '../../../constants/errors';
-
-const {NO_REF_IMAGE_ERROR} = getCommonErrors();
+import {isAcceptable} from '../../modules/utils';
 
 class SectionBrowserBody extends Component {
     static propTypes = {
@@ -55,9 +53,8 @@ class SectionBrowserBody extends Component {
 
     _addExtraButtons(activeResult) {
         const {gui, running} = this.props;
-        const {status, reason} = activeResult;
-        const stack = reason && reason.stack;
-        const acceptDisabled = !(isErroredStatus(status) && stack.startsWith(NO_REF_IMAGE_ERROR) || isFailStatus(status));
+        const {status} = activeResult;
+        const acceptDisabled = !isAcceptable(activeResult);
         const retryDisabled = running || isSuccessStatus(status) || (!isFailStatus(status) && !isErroredStatus(status));
 
         return gui

diff --git a/lib/static/modules/actions.js b/lib/static/modules/actions.js
@@ -4,7 +4,7 @@ import axios from 'axios';
 import {assign, filter, flatMap, set, cloneDeep} from 'lodash';
 import actionNames from './action-names';
 import {QUEUED} from '../../constants/test-statuses';
-import {isSuiteFailed} from './utils';
+import {isSuiteFailed, isAcceptable} from './utils';
 
 const localStorage = window.localStorage;
 
@@ -55,6 +55,10 @@ export const retryTest = (suite, browserId = null) => {
 };
 
 export const acceptAll = (fails, actionName = actionNames.ACCEPT_ALL) => {
+    if (actionName === actionNames.ACCEPT_ALL) {
+        fails = filterAcceptableBrowsers([].concat(fails));
+    }
+
     const formattedFails = flatMap([].concat(fails), formatTests);
 
     return async (dispatch) => {
@@ -123,12 +127,20 @@ function formatTests(test) {
     });
 }
 
-function filterFailedBrowsers(suites = []) {
+function filterBrowsers(suites = [], filterFn) {
     const modifySuite = (suite) => {
         return suite.children
             ? flatMap(suite.children, modifySuite)
-            : set(suite, 'browsers', filter(suite.browsers, ({result}) => isSuiteFailed(result)));
+            : set(suite, 'browsers', filter(suite.browsers, ({result}) => filterFn(result)));
     };
 
     return flatMap(cloneDeep(suites), modifySuite);
 }
+
+function filterFailedBrowsers(suites = []) {
+    return filterBrowsers(suites, isSuiteFailed);
+}
+
+function filterAcceptableBrowsers(suites = []) {
+    return filterBrowsers(suites, isAcceptable);
+}
diff --git a/lib/static/modules/utils.js b/lib/static/modules/utils.js
@@ -2,6 +2,9 @@
 
 const {isArray, find, get, values} = require('lodash');
 const {isSuccessStatus, isFailStatus, isErroredStatus, isSkippedStatus, isUpdatedStatus} = require('../../common-utils');
+const {getCommonErrors} = require('../../constants/errors');
+
+const {NO_REF_IMAGE_ERROR} = getCommonErrors();
 
 function hasFails(node) {
     const {result} = node;
@@ -14,6 +17,12 @@ function isSuiteFailed(suite) {
     return isFailStatus(suite.status) || isErroredStatus(suite.status);
 }
 
+function isAcceptable({status, reason = ''}) {
+    const stack = reason && reason.stack;
+
+    return isErroredStatus(status) && stack.startsWith(NO_REF_IMAGE_ERROR) || isFailStatus(status);
+}
+
 function hasRetries(node) {
     const isRetried = node.retries && node.retries.length;
     return isRetried || walk(node, hasRetries);
@@ -89,6 +98,7 @@ function setStatusForBranch(nodes, suitePath, status) {
 module.exports = {
     hasFails,
     isSuiteFailed,
+    isAcceptable,
     hasRetries,
     allSkipped,
     findNode,