updates of testcafe-browser-provider-electron

vlad-dargel · vlad-dargel · commit dce87120d451 · 2023-05-05T12:30:53.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -998,9 +998,15 @@ workflows:
       - e2e-tests:
           name: E2ETest
           build: docker
-          parallelism: 4
+          parallelism: 1
           requires:
             - Build docker image
+      - e2e-exe:
+          name: E2ETest (exe)
+          parallelism: 1
+          report: true
+          requires:
+            - Build app - Windows (stage)
       # Approve to build
       - approve:
           name: Build App
@@ -1230,10 +1236,10 @@ workflows:
           name: Build app - Linux (stage)
           requires:
             - Setup build (stage)
-#      - windows:
-#          name: Build app - Windows (stage)
-#          requires:
-#            - Setup build (stage)
+      #  - windows:
+      #      name: Build app - Windows (stage)
+      #      requires:
+      #        - Setup build (stage)
       # integration tests on docker image build
       - integration-tests-run:
           matrix:
diff --git a/tests/e2e/desktop.runner.ts b/tests/e2e/desktop.runner.ts
@@ -5,10 +5,15 @@ import testcafe from 'testcafe';
         .then(t => {
             return t
                 .createRunner()
+                .compilerOptions({
+                    "typescript": {
+                        configPath: 'tsconfig.testcafe.json',
+                        experimentalDecorators: true
+                     }})
                 .src((process.env.TEST_FILES || 'tests/**/*.e2e.ts').split('\n'))
                 .browsers(['electron'])
                 .filter((_testName, _fixtureName, _fixturePath, testMeta): boolean => {
-                    return testMeta.env !== 'web'
+                    return testMeta.env == 'desktop'
                 })
                 .screenshots({
                     path: 'report/screenshots/',
diff --git a/tests/e2e/desktop.runner.win.ts b/tests/e2e/desktop.runner.win.ts
@@ -5,10 +5,15 @@ import testcafe from 'testcafe';
         .then(t => {
             return t
                 .createRunner()
+                .compilerOptions({
+                    "typescript": {
+                        configPath: 'tsconfig.testcafe.json',
+                        experimentalDecorators: true
+                     }})
                 .src((process.env.TEST_FILES || 'tests/**/*.e2e.ts').split('\n'))
                 .browsers(['electron'])
                 .filter((_testName, _fixtureName, _fixturePath, testMeta): boolean => {
-                    return testMeta.env !== 'web' && testMeta.rte === 'standalone';
+                    return testMeta.env == 'desktop' && testMeta.rte === 'standalone';
                 })
                 .screenshots({
                     path: 'report/screenshots/',
diff --git a/tests/e2e/package.json b/tests/e2e/package.json
@@ -18,7 +18,7 @@
     "lint": "eslint . --ext .ts,.js,.tsx,.jsx",
     "test:desktop:ci": "ts-node ./desktop.runner.ts",
     "test:desktop:ci:win": "ts-node ./desktop.runner.win.ts",
-    "test:desktop": "testcafe electron tests/ --browser-init-timeout 180000 -e -r html:./report/desktop-report.html,spec -s takeOnFails=true,path=report/screenshots,pathPattern=${OS}_${BROWSER}/${DATE}_${TIME}/${FIXTURE}_${TEST}_${FILE_INDEX}.png"
+    "test:desktop": "testcafe electron tests/ --compiler-options typescript.configPath=tsconfig.testcafe.json --browser-init-timeout 180000 -e -r html:./report/desktop-report.html,spec -s takeOnFails=true,path=report/screenshots,pathPattern=${OS}_${BROWSER}/${DATE}_${TIME}/${FIXTURE}_${TEST}_${FILE_INDEX}.png"
   },
   "keywords": [],
   "author": "",
@@ -45,7 +45,7 @@
     "sqlite3": "5.0.10",
     "supertest": "^4.0.2",
     "testcafe": "1.14.2",
-    "testcafe-browser-provider-electron": "0.0.18",
+    "testcafe-browser-provider-electron": "0.0.19",
     "testcafe-reporter-html": "1.4.6",
     "testcafe-reporter-json": "2.2.0",
     "testcafe-reporter-spec": "2.1.1",
diff --git a/tests/e2e/tests/smoke/browser/add-keys.e2e.ts b/tests/e2e/tests/smoke/browser/add-keys.e2e.ts
@@ -1,4 +1,4 @@
-import { rte } from '../../../helpers/constants';
+import { env, rte } from '../../../helpers/constants';
 import { deleteDatabase, acceptTermsAddDatabaseOrConnectToRedisStack } from '../../../helpers/database';
 import { BrowserPage } from '../../../pageObjects';
 import { commonUrl, ossStandaloneConfig } from '../../../helpers/conf';
@@ -19,7 +19,8 @@ fixture `Add keys`
         await browserPage.deleteKeyByName(keyName);
         await deleteDatabase(ossStandaloneConfig.databaseName);
     });
-test('Verify that user can add Hash Key', async t => {
+test.only
+.meta({ type: 'smoke', rte: rte.standalone, env: env.desktop })('Verify that user can add Hash Key', async t => {
     keyName = Common.generateWord(10);
     // Add Hash key
     await browserPage.addHashKey(keyName);
diff --git a/tests/e2e/yarn.lock b/tests/e2e/yarn.lock
@@ -1933,13 +1933,13 @@ chrome-remote-interface@^0.25.3:
     commander "2.11.x"
     ws "3.3.x"
 
-chrome-remote-interface@^0.27.0:
-  version "0.27.2"
-  resolved "https://registry.yarnpkg.com/chrome-remote-interface/-/chrome-remote-interface-0.27.2.tgz#e5605605f092b7ef8575d95304e004039c9d0ab9"
-  integrity sha512-pVLljQ29SAx8KIv5tSa9sIf8GrEsAZdPJoeWOmY3/nrIzFmE+EryNNHvDkddGod0cmAFTv+GmPG0uvzxi2NWsA==
+chrome-remote-interface@^0.31.3:
+  version "0.31.3"
+  resolved "https://registry.yarnpkg.com/chrome-remote-interface/-/chrome-remote-interface-0.31.3.tgz#bd01b89f5f0e968f7eeb37b8b7c5ac20e6e1f4d0"
+  integrity sha512-NTwb1YNPHXLTus1RjqsLxJmdViKwKJg/lrFEcM6pbyQy04Ow2QKWHXyPpxzwE+dFsJghWuvSAdTy4W0trluz1g==
   dependencies:
     commander "2.11.x"
-    ws "^6.1.0"
+    ws "^7.2.0"
 
 chromium-pickle-js@^0.2.0:
   version "0.2.0"
@@ -5429,13 +5429,13 @@ tar@^6.0.2, tar@^6.1.11, tar@^6.1.2:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
-testcafe-browser-provider-electron@0.0.18:
-  version "0.0.18"
-  resolved "https://registry.yarnpkg.com/testcafe-browser-provider-electron/-/testcafe-browser-provider-electron-0.0.18.tgz#c4294a7fefe5006c5eb85c06db9ca620f2ba919b"
-  integrity sha512-s2Oz62uMi+FygttEm6Ab+cCgBFdbDhoZmA2Q02jQePYK/cVmn8vFL9MDxqppwIcZeknZCtg33hFNX4MgQndPlA==
+testcafe-browser-provider-electron@0.0.19:
+  version "0.0.19"
+  resolved "https://registry.yarnpkg.com/testcafe-browser-provider-electron/-/testcafe-browser-provider-electron-0.0.19.tgz#739d0671630c4074e212ca4a23e71e58ef6cc677"
+  integrity sha512-ecSf71hRPpT7ezUWwG3eB7l+hn7t2yVXXdu4k+uTn/REa+naBzT0Koa4WiDRug7HsV8QPbA7G87A3fQ8+7PfMA==
   dependencies:
     babel-runtime "^6.25.0"
-    chrome-remote-interface "^0.27.0"
+    chrome-remote-interface "^0.31.3"
     debug "4.1.1"
     dedent "^0.7.0"
     endpoint-utils "^1.0.2"
@@ -6111,12 +6111,10 @@ ws@3.3.x:
     safe-buffer "~5.1.0"
     ultron "~1.1.0"
 
-ws@^6.1.0:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
-  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
-  dependencies:
-    async-limiter "~1.0.0"
+ws@^7.2.0:
+  version "7.5.9"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
+  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
 
 yallist@^3.0.2:
   version "3.1.1"
