feat(stats): move part of the logic to the gemini-core

DudaGod · DudaGod · commit 99e7e0c1a1cc · 2018-02-04T23:59:52.000+03:00
diff --git a/lib/stats.js b/lib/stats.js
@@ -1,72 +1,40 @@
 'use strict';
 
-const _ = require('lodash');
+const {BaseStats} = require('gemini-core');
 const RunnerEvents = require('./constants/events');
 
-const STATS = {
-    total: 'total',
-    updated: 'updated',
-    passed: 'passed',
-    failed: 'failed',
-    skipped: 'skipped',
-    retries: 'retries'
+const statNames = {
+    TOTAL: 'total',
+    UPDATED: 'updated',
+    PASSED: 'passed',
+    FAILED: 'failed',
+    SKIPPED: 'skipped',
+    RETRIES: 'retries'
 };
 
-module.exports = class Stats {
-    static create() {
-        return new Stats();
+module.exports = class Stats extends BaseStats {
+    constructor() {
+        super(statNames);
     }
 
-    constructor() {
-        this._stats = {};
+    addUpdated(test) {
+        return this._addStat(this._statNames.UPDATED, test);
     }
 
     attachRunner(runner) {
         runner
-            .on(RunnerEvents.SKIP_STATE, (test) => this._addStat(STATS.skipped, 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);
-            })
-            .on(RunnerEvents.TEST_RESULT, (test) => {
-                return test.equal ? this._addStat(STATS.passed, test) : this._addStat(STATS.failed, test);
-            })
-            .on(RunnerEvents.RETRY, (test) => this._getSuiteStats(test).retries++);
+            .on(RunnerEvents.SKIP_STATE, (test) => this.addSkipped(test))
+            .on(RunnerEvents.ERROR, (test) => this.addFailed(test))
+            .on(RunnerEvents.UPDATE_RESULT, (test) => test.updated ? this.addUpdated(test) : this.addPassed(test))
+            .on(RunnerEvents.TEST_RESULT, (test) => test.equal ? this.addPassed(test) : this.addFailed(test))
+            .on(RunnerEvents.RETRY, () => this.addRetries());
     }
 
-    _addStat(stat, test) {
-        this._getSuiteStats(test).states[test.state.name] = stat;
-    }
-
-    _getSuiteStats(test) {
-        const key = this._buildSuiteKey(test);
-
-        if (!this._stats[key]) {
-            this._stats[key] = {
-                retries: 0,
-                states: {}
-            };
-        }
-
-        return this._stats[key];
+    _buildStateKey(test) {
+        return test.state.name;
     }
 
     _buildSuiteKey(test) {
         return `${test.suite.fullName} ${test.browserId}`;
     }
-
-    getResult() {
-        const statNames = _.keys(STATS);
-        const result = _.zipObject(statNames, _.fill(Array(statNames.length), 0));
-
-        _.forEach(this._stats, (suiteStats) => {
-            result.retries += suiteStats.retries;
-            _.forEach(suiteStats.states, (stateStatus) => {
-                result.total++;
-                result[stateStatus]++;
-            });
-        });
-
-        return result;
-    }
 };
diff --git a/test/unit/stats.js b/test/unit/stats.js
@@ -1,9 +1,9 @@
 'use strict';
 
-const EventEmitter = require('events').EventEmitter;
+const {EventEmitter} = require('events');
 const RunnerEvents = require('../../lib/constants/events');
 const Stats = require('../../lib/stats');
-const makeStateResult = require('../util').makeStateResult;
+const {makeStateResult} = require('../util');
 
 describe('Stats', () => {
     let stats;
