fix: skipped state merge should affect branch statuses

gemini-testing · Jun 7, 2019 · 7c79494 · 7c79494
1 parent 1dc627f
commit 7c79494
Show file tree

Hide file tree

Showing 5 changed files with 1,353 additions and 221 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ hot
 
 .idea
 .vscode
+.nyc_output
diff --git a/lib/merge-reports/data-tree.js b/lib/merge-reports/data-tree.js
@@ -4,7 +4,6 @@ const path = require('path');
 const _ = require('lodash');
 const Promise = require('bluebird');
 const fs = require('fs-extra');
-const {isSkippedStatus} = require('../common-utils');
 const {findNode, setStatusForBranch} = require('../static/modules/utils');
 const {getDataFrom, getStatNameForStatus, getImagePaths} = require('./utils');
 
@@ -126,9 +125,7 @@ module.exports = class DataTree {
         const statName = getStatNameForStatus(existentBro.result.status);
         this._data[statName] += 1;
 
-        if (!isSkippedStatus(existentBro.result.status)) {
-            setStatusForBranch(this._data.suites, suitePath, existentBro.result.status);
-        }
+        setStatusForBranch(this._data.suites, suitePath, existentBro.result.status);
     }
 
     _mergeStatistics(node) {