diff --git a/CHANGELOG.md b/CHANGELOG.md
index 198621bfe..4f4a963eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+
+# [5.4.0](https://github.com/gemini-testing/gemini/compare/v5.3.0...v5.4.0) (2018-02-04)
+
+
+### Features
+
+* **stats:** move part of the logic to the gemini-core ([99e7e0c](https://github.com/gemini-testing/gemini/commit/99e7e0c))
+
+
+
# [5.3.0](https://github.com/gemini-testing/gemini/compare/v5.2.1...v5.3.0) (2018-01-30)
diff --git a/lib/stats.js b/lib/stats.js
index 626b7fdd1..02a52807d 100644
--- 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/package-lock.json b/package-lock.json
index 1b4e2152d..08e086f4e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "gemini",
- "version": "5.3.0",
+ "version": "5.4.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -979,7 +979,7 @@
"git-raw-commits": "1.3.0",
"git-remote-origin-url": "2.0.0",
"git-semver-tags": "1.3.0",
- "lodash": "4.17.4",
+ "lodash": "4.17.5",
"normalize-package-data": "2.4.0",
"q": "1.5.1",
"read-pkg": "1.1.0",
@@ -995,7 +995,7 @@
"requires": {
"is-text-path": "1.0.1",
"JSONStream": "1.3.2",
- "lodash": "4.17.4",
+ "lodash": "4.17.5",
"meow": "3.7.0",
"split2": "2.2.0",
"through2": "2.0.3",
@@ -1093,6 +1093,14 @@
"mz": "2.6.0",
"pos": "0.4.2",
"rc": "1.1.7"
+ },
+ "dependencies": {
+ "lodash": {
+ "version": "4.17.4",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+ "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+ "dev": true
+ }
}
},
"conventional-changelog-lint-config-angular": {
@@ -1112,7 +1120,7 @@
"dateformat": "1.0.12",
"handlebars": "4.0.11",
"json-stringify-safe": "5.0.1",
- "lodash": "4.17.4",
+ "lodash": "4.17.5",
"meow": "3.7.0",
"semver": "5.5.0",
"split": "1.0.1",
@@ -1137,7 +1145,7 @@
"requires": {
"is-text-path": "1.0.1",
"JSONStream": "1.3.2",
- "lodash": "4.17.4",
+ "lodash": "4.17.5",
"meow": "3.7.0",
"split2": "2.2.0",
"through2": "2.0.3",
@@ -1167,7 +1175,7 @@
"requires": {
"is-text-path": "1.0.1",
"JSONStream": "1.3.2",
- "lodash": "4.17.4",
+ "lodash": "4.17.5",
"meow": "3.7.0",
"split2": "2.2.0",
"through2": "2.0.3",
@@ -1671,14 +1679,14 @@
"resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz",
"integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==",
"requires": {
- "acorn": "5.3.0",
+ "acorn": "5.4.1",
"defined": "1.0.0"
},
"dependencies": {
"acorn": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz",
- "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug=="
+ "version": "5.4.1",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.4.1.tgz",
+ "integrity": "sha512-XLmq3H/BVvW6/GbxKryGxWORz1ebilSsUDlyC27bXhWGWAZWkGwS6FLHjOlwFXNFoWFQEO/Df4u0YYd0K3BQgQ=="
}
}
},
@@ -1955,7 +1963,7 @@
"debug": "2.6.9",
"doctrine": "2.1.0",
"escope": "3.6.0",
- "espree": "3.5.2",
+ "espree": "3.5.3",
"esquery": "1.0.0",
"estraverse": "4.2.0",
"esutils": "2.0.2",
@@ -1970,7 +1978,7 @@
"js-yaml": "3.10.0",
"json-stable-stringify": "1.0.1",
"levn": "0.3.0",
- "lodash": "4.17.4",
+ "lodash": "4.17.5",
"mkdirp": "0.5.1",
"natural-compare": "1.4.0",
"optionator": "0.8.2",
@@ -2010,19 +2018,19 @@
"dev": true
},
"espree": {
- "version": "3.5.2",
- "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.2.tgz",
- "integrity": "sha512-sadKeYwaR/aJ3stC2CdvgXu1T16TdYN+qwCpcWbMnGJ8s0zNWemzrvb2GbD4OhmJ/fwpJjudThAlLobGbWZbCQ==",
+ "version": "3.5.3",
+ "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.3.tgz",
+ "integrity": "sha512-Zy3tAJDORxQZLl2baguiRU1syPERAIg0L+JB2MWorORgTu/CplzvxS9WWA7Xh4+Q+eOQihNs/1o1Xep8cvCxWQ==",
"dev": true,
"requires": {
- "acorn": "5.3.0",
+ "acorn": "5.4.1",
"acorn-jsx": "3.0.1"
},
"dependencies": {
"acorn": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz",
- "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==",
+ "version": "5.4.1",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.4.1.tgz",
+ "integrity": "sha512-XLmq3H/BVvW6/GbxKryGxWORz1ebilSsUDlyC27bXhWGWAZWkGwS6FLHjOlwFXNFoWFQEO/Df4u0YYd0K3BQgQ==",
"dev": true
}
}
@@ -2323,19 +2331,19 @@
"resolved": "https://registry.npmjs.org/gemini-configparser/-/gemini-configparser-1.0.0.tgz",
"integrity": "sha1-lKjZTqTqESh9nEChnHSSFo7toCA=",
"requires": {
- "lodash": "4.17.4"
+ "lodash": "4.17.5"
}
},
"gemini-core": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/gemini-core/-/gemini-core-2.4.0.tgz",
- "integrity": "sha512-E+f8EzXg6wjGXhJeLnKzJWHNp1LMQTXByXW6u1i62i5njaBU5ndoq0mse8IIO16AWBpDpWNJcwMKs4s/pU76lA==",
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/gemini-core/-/gemini-core-2.5.0.tgz",
+ "integrity": "sha512-feYKv9R5easfh8MkUaoY/XGZChJEiqbNPXb+spvXQQIGV29BXrYNWJrY3JNyuDe5z1RI2wDUz1pwsYegr3YXVg==",
"requires": {
"bluebird": "3.5.1",
"debug": "2.6.9",
"gemini-configparser": "1.0.0",
"glob-extra": "3.0.0",
- "lodash": "4.17.4",
+ "lodash": "4.17.5",
"looks-same": "3.3.0",
"micromatch": "2.3.11",
"png-img": "2.1.1",
@@ -2551,6 +2559,12 @@
"graceful-fs": "4.1.11"
}
},
+ "lodash": {
+ "version": "4.17.4",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+ "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
+ "dev": true
+ },
"minimist": {
"version": "0.0.10",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
@@ -2634,7 +2648,7 @@
"requires": {
"bluebird": "3.5.1",
"glob": "7.1.2",
- "lodash": "4.17.4"
+ "lodash": "4.17.5"
}
},
"glob-parent": {
@@ -2943,7 +2957,7 @@
"cli-cursor": "1.0.2",
"cli-width": "2.2.0",
"figures": "1.7.0",
- "lodash": "4.17.4",
+ "lodash": "4.17.5",
"readline2": "1.0.1",
"run-async": "0.1.0",
"rx-lite": "3.1.2",
@@ -3519,9 +3533,9 @@
}
},
"lodash": {
- "version": "4.17.4",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
- "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
+ "version": "4.17.5",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz",
+ "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw=="
},
"lodash._reinterpolate": {
"version": "3.0.0",
@@ -3577,7 +3591,7 @@
"requires": {
"color-diff": "0.1.7",
"concat-stream": "1.5.2",
- "lodash": "4.17.4",
+ "lodash": "4.17.5",
"parse-color": "1.0.0",
"pngjs": "3.3.1"
}
@@ -3630,7 +3644,7 @@
"integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
"dev": true,
"requires": {
- "mimic-fn": "1.1.0"
+ "mimic-fn": "1.2.0"
}
},
"meow": {
@@ -3700,9 +3714,9 @@
}
},
"mimic-fn": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
- "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+ "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
"dev": true
},
"minimalistic-assert": {
@@ -8827,7 +8841,7 @@
"resolved": "https://registry.npmjs.org/plugins-loader/-/plugins-loader-1.1.0.tgz",
"integrity": "sha512-AVLb8tpRhQn3buabonz19+VMBc2CW1iLFuZzEiIqHqsCdBgE6PRZ/YtPyKtYv91Esp7WRFAH+ruUtRnkQwrxwA==",
"requires": {
- "lodash": "4.17.4"
+ "lodash": "4.17.5"
}
},
"pluralize": {
@@ -9360,7 +9374,7 @@
"path-to-regexp": "1.7.0",
"samsam": "1.3.0",
"text-encoding": "0.6.4",
- "type-detect": "4.0.7"
+ "type-detect": "4.0.8"
},
"dependencies": {
"diff": {
@@ -9370,9 +9384,9 @@
"dev": true
},
"type-detect": {
- "version": "4.0.7",
- "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.7.tgz",
- "integrity": "sha512-4Rh17pAMVdMWzktddFhISRnUnFIStObtUMNGzDwlA6w/77bmGv3aBbRdCmQR6IjzfkTo9otnW+2K/cDRhKSxDA==",
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+ "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
"dev": true
}
}
@@ -9798,7 +9812,7 @@
"ajv": "4.11.8",
"ajv-keywords": "1.5.1",
"chalk": "1.1.3",
- "lodash": "4.17.4",
+ "lodash": "4.17.5",
"slice-ansi": "0.0.4",
"string-width": "2.1.1"
},
diff --git a/package.json b/package.json
index 36f7e399a..4a96602b8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "gemini",
- "version": "5.3.0",
+ "version": "5.4.0",
"description": "UI Screenshot testing utility",
"engines": {
"node": ">= 6.0.0"
@@ -19,7 +19,7 @@
"debug": "^2.2.0",
"fs-extra": "^0.30.0",
"gemini-configparser": "^1.0.0",
- "gemini-core": "^2.4.0",
+ "gemini-core": "^2.5.0",
"gemini-coverage": "^2.0.0",
"graceful-fs": "^4.1.11",
"handlebars": "^4.0.5",
diff --git a/test/unit/stats.js b/test/unit/stats.js
index c7add021c..d2fcfa0fe 100644
--- 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;