fix: bug with count of failed tests in the statistic

rostik404 · rostik404 · commit ef550c56837a · 2017-06-06T17:11:54.000+03:00
diff --git a/doc/programmatic-api.md b/doc/programmatic-api.md
@@ -164,8 +164,6 @@ Returns promise that resolve to a stats object with following keys:
 
 * `skipped` &mdash; number of skipped tests.
 
-* `errored` &mdash; number of errored tests.
-
 Rejects promise if critical error occurred.
 
 ## Running tests
@@ -197,8 +195,6 @@ Returns promise that resolve to a stats object with following keys:
 
 * `skipped` &mdash; number of skipped tests.
 
-* `errored` &mdash; number of errored tests.
-
 * `passed` &mdash; number of passed tests.
 
 * `failed` &mdash; number of failed tests.
diff --git a/lib/cli/index.js b/lib/cli/index.js
@@ -113,12 +113,7 @@ function runGemini(method, paths, options) {
                 new: options.new
             });
         })
-        .then((stats) => {
-            if (stats.failed > 0 || stats.errored > 0) {
-                return 2;
-            }
-            return 0;
-        })
+        .then((stats) => stats.failed > 0 ? 2 : 0)
         .catch(handleErrors)
         .then(exit);
 }
diff --git a/lib/stats.js b/lib/stats.js
@@ -8,7 +8,6 @@ const STATS = {
     updated: 'updated',
     passed: 'passed',
     failed: 'failed',
-    errored: 'errored',
     skipped: 'skipped',
     warned: 'warned',
     retries: 'retries'
@@ -27,7 +26,7 @@ module.exports = class Stats {
         runner
             .on(RunnerEvents.SKIP_STATE, (test) => this._addStat(STATS.skipped, test))
             .on(RunnerEvents.WARNING, (test) => this._addStat(STATS.warned, test))
-            .on(RunnerEvents.ERROR, (test) => this._addStat(STATS.errored, test))
+            .on(RunnerEvents.ERROR, (test) => this._addStat(STATS.failed, test))
             .on(RunnerEvents.UPDATE_RESULT, (test) => {
                 return test.updated ? this._addStat(STATS.updated, test) : this._addStat(STATS.passed, test);
             })
diff --git a/test/unit/stats.js b/test/unit/stats.js
@@ -27,12 +27,6 @@ describe('Stats', () => {
         assert.equal(stats.getResult().warned, 1);
     });
 
-    it('should count errored tests', () => {
-        runner.emit(RunnerEvents.ERROR, makeStateResult());
-
-        assert.equal(stats.getResult().errored, 1);
-    });
-
     it('should count updated tests', () => {
         runner.emit(RunnerEvents.UPDATE_RESULT, makeStateResult({updated: true}));
 
@@ -45,6 +39,12 @@ describe('Stats', () => {
         assert.equal(stats.getResult().passed, 1);
     });
 
+    it('should count failed tests on "ERROR" event', () => {
+        runner.emit(RunnerEvents.ERROR, makeStateResult());
+
+        assert.equal(stats.getResult().failed, 1);
+    });
+
     it('should count failed tests on "TEST_RESULT" event', () => {
         runner.emit(RunnerEvents.TEST_RESULT, makeStateResult({equal: false}));
 
@@ -79,7 +79,7 @@ describe('Stats', () => {
         assert.equal(stats.getResult().total, 2);
     });
 
-    it('should getResult full stat', () => {
+    it('should return correct full statistic', () => {
         runner.emit(RunnerEvents.UPDATE_RESULT, makeStateResult({updated: true, name: 'updated'}));
         runner.emit(RunnerEvents.RETRY, makeStateResult({name: 'passed'}));
         runner.emit(RunnerEvents.TEST_RESULT, makeStateResult({equal: true, name: 'passed'}));
@@ -92,8 +92,7 @@ describe('Stats', () => {
             total: 6,
             updated: 1,
             passed: 1,
-            failed: 1,
-            errored: 1,
+            failed: 2,
             skipped: 1,
             warned: 1,
             retries: 1
@@ -105,7 +104,7 @@ describe('Stats', () => {
         runner.emit(RunnerEvents.ERROR, makeStateResult({name: 'some-state'}));
 
         assert.equal(stats.getResult().skipped, 0);
-        assert.equal(stats.getResult().errored, 1);
+        assert.equal(stats.getResult().failed, 1);
     });
 
     it('should not count test result twice for same state and browser', () => {
@@ -118,10 +117,10 @@ describe('Stats', () => {
         runner.emit(RunnerEvents.ERROR, test);
 
         assert.equal(stats.getResult().total, 1);
-        assert.equal(stats.getResult().errored, 1);
+        assert.equal(stats.getResult().failed, 1);
     });
 
-    it('should create suite key by suite full name and suite browser id divided by space', () => {
+    it('should correctly handle tests with the similar titles', () => {
         const test1 = makeStateResult({
             suite: {fullName: 'some case'},
             browserId: 'bro'
@@ -135,6 +134,6 @@ describe('Stats', () => {
         runner.emit(RunnerEvents.ERROR, test2);
 
         assert.equal(stats.getResult().total, 2);
-        assert.equal(stats.getResult().errored, 2);
+        assert.equal(stats.getResult().failed, 2);
     });
 });

-Original file line number
+Diff line change
 * `skipped` — number of skipped tests.
 -* `errored` — number of errored tests.
+-
 Rejects promise if critical error occurred.
 ## Running tests
 * `skipped` — number of skipped tests.
 -* `errored` — number of errored tests.
+-
 * `passed` — number of passed tests.
 * `failed` — number of failed tests.