chore: re-write tool-runner/runner to typescript

lib/gui/tool-runner/index.ts → lib/gui/tool-runner/index.js

@@ -7,9 +7,9 @@ const chalk = require('chalk');
 const Promise = require('bluebird');
 const looksSame = require('looks-same');
 
-const Runner = require('./runner');
+const {createTestRunner} = require('./runner');
 const subscribeOnToolEvents = require('./report-subscriber');
-const {GuiReportBuilder} = require('../../report-builder/gui');
+const GuiReportBuilder = require('../../report-builder/gui');
 const EventSource = require('../event-source');
 const {logger} = require('../../common-utils');
 const reporterHelper = require('../../reporter-helpers');
@@ -202,7 +202,7 @@ module.exports = class ToolRunner {
     run(tests = []) {
         const {grep, set: sets, browser: browsers} = this._globalOpts;
 
-        return Runner.create(this._collection, tests)
+        return createTestRunner(this._collection, tests)
             .run((collection) => this._hermione.run(collection, {grep, sets, browsers}));
     }
 
@@ -250,15 +250,7 @@ module.exports = class ToolRunner {
             return _.extend(imageInfo, {expectedImg: refImg});
         });
 
-        const res = _.merge({}, rawTest, {
-            assertViewResults,
-            imagesInfo,
-            sessionId,
-            attempt,
-            err: test.error,
-            meta: {url},
-            updated: true
-        });
+        const res = _.merge({}, rawTest, {assertViewResults, imagesInfo, sessionId, attempt, origAttempt: attempt, meta: {url}, updated: true});
 
         // _.merge can't fully clone test object since hermione@7+
         // TODO: use separate object to represent test results. Do not extend test object with test results

lib/gui/tool-runner/runner/all-test-runner.ts

@@ -0,0 +1,9 @@
+import {BaseRunner, TestCollection} from './runner';
+
+export class AllTestRunner extends BaseRunner {
+    override run<U>(runHandler: (testCollection: TestCollection) => U): U {
+        this._collection.enableAll();
+
+        return super.run(runHandler);
+    }
+}

lib/gui/tool-runner/runner/index.ts

@@ -0,0 +1,11 @@
+import _ from 'lodash';
+
+import {TestCollection, TestRunner, TestSpec} from './runner';
+import {AllTestRunner} from './all-test-runner';
+import {SpecificTestRunner} from './specific-test-runner';
+
+export const createTestRunner = (collection: TestCollection, tests: TestSpec[]): TestRunner => {
+    return _.isEmpty(tests)
+        ? new AllTestRunner(collection)
+        : new SpecificTestRunner(collection, tests);
+};

lib/gui/tool-runner/runner/runner.ts

@@ -0,0 +1,25 @@
+import Hermione from 'hermione';
+import {AsyncReturnType} from 'type-fest';
+
+export type TestCollection = AsyncReturnType<Hermione['readTests']>
+
+export interface TestRunner {
+    run<U>(handler: (testCollection: TestCollection) => U): U;
+}
+
+export interface TestSpec {
+    testName: string;
+    browserName: string;
+}
+
+export class BaseRunner implements TestRunner {
+    protected _collection: TestCollection;
+
+    constructor(collection: TestCollection) {
+        this._collection = collection;
+    }
+
+    run<U>(runHandler: (testCollection: TestCollection) => U): U {
+        return runHandler(this._collection);
+    }
+}

lib/gui/tool-runner/runner/specific-test-runner.ts

@@ -0,0 +1,25 @@
+import {BaseRunner, TestCollection, TestSpec} from './runner';
+
+export class SpecificTestRunner extends BaseRunner {
+    private _tests: TestSpec[];
+
+    constructor(collection: TestCollection, tests: TestSpec[]) {
+        super(collection);
+
+        this._tests = tests;
+    }
+
+    override run<U>(runHandler: (testCollection: TestCollection) => U): U {
+        this._filter();
+
+        return super.run(runHandler);
+    }
+
+    private _filter(): void {
+        this._collection.disableAll();
+
+        this._tests.forEach(({testName, browserName}) => {
+            this._collection.enableTest(testName, browserName);
+        });
+    }
+}