test: fixing tests

lib/gui/tool-runner/index.js

@@ -19,6 +19,7 @@ const {getShortMD5} = require('../../common-utils');
 const {formatId, mkFullTitle, mergeDatabasesForReuse, filterByEqualDiffSizes} = require('./utils');
 const {getTestsTreeFromDatabase} = require('../../db-utils/server');
 const {formatTestResult} = require('../../server-utils');
+const {ToolName} = require('../../constants');
 
 module.exports = class ToolRunner {
     static create(paths, hermione, configs) {
@@ -280,7 +281,7 @@ module.exports = class ToolRunner {
         const dbPath = path.resolve(this._reportPath, LOCAL_DATABASE_NAME);
 
         if (await fs.pathExists(dbPath)) {
-            return getTestsTreeFromDatabase(dbPath);
+            return getTestsTreeFromDatabase(ToolName.Hermione, dbPath);
         }
 
         logger.warn(chalk.yellow(`Nothing to reuse in ${this._reportPath}: can not load data from ${DATABASE_URLS_JSON_NAME}`));

lib/report-builder/gui.js

@@ -9,6 +9,7 @@ const {IDLE, RUNNING, SKIPPED, FAIL, SUCCESS, UPDATED} = require('../constants/t
 const {isSkippedStatus, isUpdatedStatus, hasNoRefImageErrors, hasResultFails} = require('../common-utils');
 const {getConfigForStaticFile, deleteFile} = require('../server-utils');
 const {DB_COLUMNS} = require('../constants/database');
+const {ToolName} = require('../constants');
 
 module.exports = class GuiReportBuilder extends StaticReportBuilder {
     static create(...args) {
@@ -18,7 +19,7 @@ module.exports = class GuiReportBuilder extends StaticReportBuilder {
     constructor(...args) {
         super(...args);
 
-        this._testsTree = GuiTestsTreeBuilder.create();
+        this._testsTree = GuiTestsTreeBuilder.create({toolName: ToolName.Hermione});
         this._skips = [];
         this._apiValues = {};
     }

lib/static/components/section/body/meta-info/content.jsx

@@ -93,7 +93,7 @@ class MetaInfoContent extends Component {
             ...extraMetaInfo
         };
         if (result.suiteUrl) {
-            formattedMetaInfo.url = mkLinkToUrl(buildUrl(result.suiteUrl, parsedHost), result.metaInfo.url);
+            formattedMetaInfo.url = mkLinkToUrl(getUrlWithBase(result.suiteUrl, baseHost), result.metaInfo.url);
         }
 
         return metaToElements(formattedMetaInfo, metaInfoBaseUrls);

test/func/fixtures/playwright/playwright.config.ts

@@ -19,7 +19,7 @@ export default defineConfig({
         ['html-reporter-tester/playwright', {
             path: path.resolve(__dirname, 'report'),
             saveFormat: 'sqlite',
-            defaultView: 'failed',
+            defaultView: 'all',
             saveErrorDetails: true
         }]
     ],

test/func/tests/.hermione.conf.js

@@ -19,20 +19,31 @@ if (!projectUnderTest) {
     throw 'Project under test was not specified';
 }
 
-const config = _.merge(getCommonConfig(__dirname), {
+const commonConfig = getCommonConfig(__dirname);
+
+const config = _.merge(commonConfig, {
     baseUrl: `http://${serverHost}:${serverPort}/fixtures/${projectUnderTest}/report/index.html`,
 
+    browsers: {
+        // TODO: this is a hack to be able to have 2 sets of screenshots, for hermione-based report and pwt-based report
+        //       currently, those have weird tiny diffs. Would be nice to figure out the cause and have common screenshots.
+        'chrome-pwt': {...commonConfig.browsers.chrome}
+    },
+
     sets: {
         common: {
             files: 'common/**/*.hermione.js'
         },
         'common-gui': {
+            browsers: ['chrome'],
             files: 'common-gui/**/*.hermione.js'
         },
         eye: {
+            browsers: ['chrome'],
             files: 'eye/**/*.hermione.js',
         },
         plugins: {
+            browsers: ['chrome'],
             files: 'plugins/**/*.hermione.js'
         }
     },

test/func/tests/common-gui/index.hermione.js

@@ -10,8 +10,6 @@ const {getTestSectionByNameSelector, getSpoilerByNameSelector, getElementWithTex
 
 const serverHost = process.env.SERVER_HOST ?? 'host.docker.internal';
 
-const serverHost = process.env.SERVER_HOST ?? 'host.docker.internal';
-
 const projectName = process.env.PROJECT_UNDER_TEST;
 const projectDir = path.resolve(__dirname, '../../fixtures', projectName);
 const guiUrl = `http://${serverHost}:${PORTS[projectName].gui}`;

test/func/tests/common/error-group.hermione.js

@@ -8,9 +8,6 @@ describe('Error grouping', function() {
 
         const groupedTestsContainer = await browser.$('.grouped-tests');
 
-        const errorGroups = await browser.$$('.grouped-tests > div');
-        assert(errorGroups.length >= 2 && errorGroups.length <= 3);
-
         const longErrorMessageGroup = await groupedTestsContainer.$('span*=long_error_message').$('..');
 
         await expect(longErrorMessageGroup).toBeDisplayed();

test/func/tests/common/test-results-appearance.hermione.js

@@ -72,6 +72,9 @@ describe('Test results appearance', () => {
             );
 
             await hideHeader(browser);
+            await browser.execute(() =>{
+                window.scrollTo(0, 10000);
+            });
 
             await retrySelectorButton.assertView('retry-selector');
         });

test/func/tests/common/tests-details.hermione.js

@@ -14,8 +14,7 @@ describe('Test details', function() {
         await expect(await fileMetaInfo.$('span*=file')).toBeDisplayed();
     });
 
-    // TODO: figure out why this test is flaky between different runs, hermione vs playwright fixtures
-    it.skip('should prevent details summary overflow', async ({browser}) => {
+    it('should prevent details summary overflow', async ({browser}) => {
         const selector =
             getTestSectionByNameSelector('test with long error message') +
             `//summary[.${getElementWithTextSelector('span', 'message')}/..]`;

test/func/tests/package.json

@@ -3,15 +3,15 @@
   "version": "0.0.0",
   "private": true,
   "scripts": {
-    "gui:hermione-common": "PROJECT_UNDER_TEST=hermione npx hermione --set common gui",
+    "gui:hermione-common": "PROJECT_UNDER_TEST=hermione npx hermione --set common -b chrome gui",
     "gui:hermione-eye": "PROJECT_UNDER_TEST=hermione-eye npx hermione --no --set eye gui",
     "gui:hermione-gui": "PROJECT_UNDER_TEST=hermione-gui npx hermione --no --set common-gui gui",
-    "gui:playwright": "PROJECT_UNDER_TEST=playwright npx hermione --set common gui",
+    "gui:playwright": "PROJECT_UNDER_TEST=playwright npx hermione --set common -b chrome-pwt gui",
     "gui:plugins": "PROJECT_UNDER_TEST=plugins SERVER_PORT=8084 npx hermione --set plugins gui",
-    "hermione:hermione-common": "PROJECT_UNDER_TEST=hermione SERVER_PORT=8061 npx hermione --set common",
+    "hermione:hermione-common": "PROJECT_UNDER_TEST=hermione SERVER_PORT=8061 npx hermione --set common -b chrome",
     "hermione:hermione-eye": "PROJECT_UNDER_TEST=hermione-eye SERVER_PORT=8062 npx hermione --set eye",
     "hermione:hermione-gui": "PROJECT_UNDER_TEST=hermione-gui SERVER_PORT=8063 npx hermione --no --set common-gui",
-    "hermione:playwright": "PROJECT_UNDER_TEST=playwright SERVER_PORT=8065 npx hermione --set common",
+    "hermione:playwright": "PROJECT_UNDER_TEST=playwright SERVER_PORT=8065 npx hermione --set common -b chrome-pwt",
     "hermione:plugins": "PROJECT_UNDER_TEST=plugins SERVER_PORT=8064 npx hermione --set plugins",
     "test": "run-s hermione:*"
   }

test/unit/lib/static/modules/actions.js

@@ -6,6 +6,7 @@ import actionNames from 'lib/static/modules/action-names';
 import {StaticTestsTreeBuilder} from 'lib/tests-tree-builder/static';
 import {LOCAL_DATABASE_NAME} from 'lib/constants/database';
 import {DiffModes} from 'lib/constants/diff-modes';
+import {ToolName} from 'lib/constants';
 
 // eslint-disable-next-line
 globalThis.performance = globalThis.performance; // node v14 stub
@@ -177,6 +178,9 @@ describe('lib/static/modules/actions', () => {
             mergeDatabasesStub = sandbox.stub().resolves();
 
             global.window = {
+                data: {
+                    apiValues: {toolName: ToolName.Hermione}
+                },
                 location: {
                     href: 'http://localhost/random/path.html'
                 }
@@ -272,7 +276,7 @@ describe('lib/static/modules/actions', () => {
 
         it('should init plugins with the config from data.js', async () => {
             const config = {pluginsEnabled: true, plugins: []};
-            global.window.data = {config};
+            global.window.data.config = config;
 
             await actions.initStaticReport()(dispatch);
 

test/unit/lib/test-adapter/playwright.ts

@@ -190,7 +190,7 @@ describe('PlaywrightTestAdapter', () => {
         it('should return fullName', () => {
             const adapter = new PlaywrightTestAdapter(mkTestCase(), mkTestResult(), mkAdapterOptions());
 
-            assert.strictEqual(adapter.fullName, 'describe test');
+            assert.strictEqual(adapter.fullName, 'describe › test');
         });
     });
 
@@ -219,7 +219,7 @@ describe('PlaywrightTestAdapter', () => {
         it('should return imageDir', () => {
             const adapter = new PlaywrightTestAdapter(mkTestCase(), mkTestResult(), mkAdapterOptions());
 
-            assert.strictEqual(adapter.imageDir, '75bcb6c');
+            assert.strictEqual(adapter.imageDir, '4050de5');
         });
     });
 

test/unit/lib/tests-tree-builder/base.js

@@ -4,6 +4,7 @@ const _ = require('lodash');
 const proxyquire = require('proxyquire');
 const {FAIL, ERROR, SUCCESS} = require('lib/constants/test-statuses');
 const {BrowserVersions} = require('lib/constants/browser');
+const {ToolName} = require('lib/constants');
 
 describe('ResultsTreeBuilder', () => {
     const sandbox = sinon.sandbox.create();
@@ -27,7 +28,7 @@ describe('ResultsTreeBuilder', () => {
             '../common-utils': {determineStatus}
         }).BaseTestsTreeBuilder;
 
-        builder = ResultsTreeBuilder.create();
+        builder = ResultsTreeBuilder.create({toolName: ToolName.Hermione});
     });
 
     afterEach(() => sandbox.restore());

test/unit/lib/tests-tree-builder/gui.js

@@ -3,6 +3,7 @@
 const _ = require('lodash');
 const GuiResultsTreeBuilder = require('lib/tests-tree-builder/gui');
 const {FAIL, SUCCESS, IDLE, UPDATED} = require('lib/constants/test-statuses');
+const {ToolName} = require('lib/constants');
 
 describe('GuiResultsTreeBuilder', () => {
     let builder;
@@ -19,8 +20,10 @@ describe('GuiResultsTreeBuilder', () => {
         });
     };
 
+    const mkGuiTreeBuilder = () => GuiResultsTreeBuilder.create({toolName: ToolName.Hermione});
+
     beforeEach(() => {
-        builder = GuiResultsTreeBuilder.create();
+        builder = mkGuiTreeBuilder();
     });
 
     describe('"getLastResult" method', () => {
@@ -72,7 +75,7 @@ describe('GuiResultsTreeBuilder', () => {
     describe('"reuseTestsTree" method', () => {
         describe('reuse browsers', () => {
             it('should not reuse browser result if browser ids are not matched', () => {
-                const srcBuilder = GuiResultsTreeBuilder.create();
+                const srcBuilder = mkGuiTreeBuilder();
                 srcBuilder.addTestResult(
                     mkTestResult_(),
                     mkFormattedResult_({testPath: ['s1'], browserId: 'b1', attempt: 0})
@@ -90,7 +93,7 @@ describe('GuiResultsTreeBuilder', () => {
             });
 
             it('should reuse browser result from the passed tree if browser ids matched', () => {
-                const srcBuilder = GuiResultsTreeBuilder.create();
+                const srcBuilder = mkGuiTreeBuilder();
                 srcBuilder.addTestResult(
                     mkTestResult_(),
                     mkFormattedResult_({testPath: ['s1'], browserId: 'b1', attempt: 0})
@@ -109,7 +112,7 @@ describe('GuiResultsTreeBuilder', () => {
 
         describe('reuse test results', () => {
             it('should not reuse result if browser ids does not matched', () => {
-                const srcBuilder = GuiResultsTreeBuilder.create();
+                const srcBuilder = mkGuiTreeBuilder();
                 srcBuilder.addTestResult(
                     mkTestResult_({status: FAIL}),
                     mkFormattedResult_({testPath: ['s1'], browserId: 'b1', attempt: 0})
@@ -127,7 +130,7 @@ describe('GuiResultsTreeBuilder', () => {
             });
 
             it('should reuse all results from the passed tree if browser ids matched', () => {
-                const srcBuilder = GuiResultsTreeBuilder.create();
+                const srcBuilder = mkGuiTreeBuilder();
                 srcBuilder.addTestResult(
                     mkTestResult_({status: FAIL}),
                     mkFormattedResult_({testPath: ['s1'], browserId: 'b1', attempt: 0})
@@ -149,7 +152,7 @@ describe('GuiResultsTreeBuilder', () => {
             });
 
             it('should register reused result ids', () => {
-                const srcBuilder = GuiResultsTreeBuilder.create();
+                const srcBuilder = mkGuiTreeBuilder();
                 srcBuilder.addTestResult(
                     mkTestResult_(),
                     mkFormattedResult_({testPath: ['s1'], browserId: 'b1', attempt: 1})
@@ -168,7 +171,7 @@ describe('GuiResultsTreeBuilder', () => {
 
         describe('reuse images', () => {
             it('should not reuse images if browser ids does not matched', () => {
-                const srcBuilder = GuiResultsTreeBuilder.create();
+                const srcBuilder = mkGuiTreeBuilder();
                 srcBuilder.addTestResult(
                     mkTestResult_({imagesInfo: [{stateName: 'img1'}]}),
                     mkFormattedResult_({testPath: ['s1'], browserId: 'b1', attempt: 0})
@@ -186,7 +189,7 @@ describe('GuiResultsTreeBuilder', () => {
             });
 
             it('should reuse all images from the passed tree if browser ids matched', () => {
-                const srcBuilder = GuiResultsTreeBuilder.create();
+                const srcBuilder = mkGuiTreeBuilder();
                 srcBuilder.addTestResult(
                     mkTestResult_({imagesInfo: [{stateName: 'img1'}, {stateName: 'img2'}]}),
                     mkFormattedResult_({testPath: ['s1'], browserId: 'b1', attempt: 0})
@@ -204,7 +207,7 @@ describe('GuiResultsTreeBuilder', () => {
             });
 
             it('should register reused images ids', () => {
-                const srcBuilder = GuiResultsTreeBuilder.create();
+                const srcBuilder = mkGuiTreeBuilder();
                 srcBuilder.addTestResult(
                     mkTestResult_({imagesInfo: [{stateName: 'img1'}, {stateName: 'img2'}]}),
                     mkFormattedResult_({testPath: ['s1'], browserId: 'b1', attempt: 0})
@@ -223,7 +226,7 @@ describe('GuiResultsTreeBuilder', () => {
 
         describe('reuse suite status', () => {
             it('should not reuse suite status if browser ids does not matched', () => {
-                const srcBuilder = GuiResultsTreeBuilder.create();
+                const srcBuilder = mkGuiTreeBuilder();
                 srcBuilder.addTestResult(
                     mkTestResult_({status: FAIL}),
                     mkFormattedResult_({testPath: ['s1'], browserId: 'b1', attempt: 0})
@@ -240,7 +243,7 @@ describe('GuiResultsTreeBuilder', () => {
             });
 
             it('should reuse suite status from passed tree with if browser ids matched', () => {
-                const srcBuilder = GuiResultsTreeBuilder.create();
+                const srcBuilder = mkGuiTreeBuilder();
                 srcBuilder.addTestResult(
                     mkTestResult_({status: FAIL}),
                     mkFormattedResult_({testPath: ['s1'], browserId: 'b1', attempt: 0})

test/unit/lib/tests-tree-builder/static.js

@@ -4,6 +4,7 @@ const _ = require('lodash');
 const {StaticTestsTreeBuilder} = require('lib/tests-tree-builder/static');
 const {SUCCESS} = require('lib/constants/test-statuses');
 const {BrowserVersions} = require('lib/constants/browser');
+const {ToolName} = require('lib/constants');
 
 describe('StaticResultsTreeBuilder', () => {
     const sandbox = sinon.sandbox.create();
@@ -68,7 +69,7 @@ describe('StaticResultsTreeBuilder', () => {
         sandbox.stub(StaticTestsTreeBuilder.prototype, 'addTestResult');
         sandbox.stub(StaticTestsTreeBuilder.prototype, 'sortTree');
 
-        builder = StaticTestsTreeBuilder.create();
+        builder = StaticTestsTreeBuilder.create({toolName: ToolName.Hermione});
     });
 
     afterEach(() => sandbox.restore());