From 5dda551a81f8da68a01e60693aec463320e4efcd Mon Sep 17 00:00:00 2001 From: Felix Zilber Date: Wed, 23 Nov 2022 11:59:57 +0200 Subject: [PATCH 1/5] feat: update selenium-standalone version --- package.json | 2 +- src/test/wdio.conf.js | 4 -- yarn.lock | 104 ++++++++++++++++++------------------------ 3 files changed, 46 insertions(+), 64 deletions(-) diff --git a/package.json b/package.json index 1cd0f6272..aea78a670 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "@wdio/devtools-service": "^7.20.5", "@wdio/local-runner": "^7.20.5", "@wdio/mocha-framework": "^7.20.3", - "@wdio/selenium-standalone-service": "7.7.4", + "@wdio/selenium-standalone-service": "^7.26.0", "adm-zip": "^0.5.9", "allure-commandline": "^2.17.2", "chai": "^4.3.6", diff --git a/src/test/wdio.conf.js b/src/test/wdio.conf.js index eb96c3d12..6aeca9939 100644 --- a/src/test/wdio.conf.js +++ b/src/test/wdio.conf.js @@ -41,10 +41,6 @@ exports.config = { // Default timeout for all waitFor* commands. waitforTimeout: waitForTimeouts, // - // Default timeout in milliseconds for request - // if Selenium Grid doesn't send response - connectionRetryTimeout: 10000, - configDataFilePath: 'src/test/resources/example.json', // // diff --git a/yarn.lock b/yarn.lock index 718278ca0..2deb010a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -705,11 +705,6 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da" integrity sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw== -"@types/node@^14.14.31": - version "14.18.21" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.21.tgz#0155ee46f6be28b2ff0342ca1a9b9fd4468bef41" - integrity sha512-x5W9s+8P4XteaxT/jKF0PSb7XEvo5VmqEWgsMlyeY4ZlLK8I6aH6g5TPPyDlLAep+GYf4kefb7HFyc7PAO3m+Q== - "@types/node@^18.0.0", "@types/node@^18.0.1": version "18.0.1" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.1.tgz#e91bd73239b338557a84d1f67f7b9e0f25643870" @@ -940,15 +935,16 @@ deepmerge "^4.0.0" glob "^8.0.3" -"@wdio/config@7.7.3": - version "7.7.3" - resolved "https://registry.yarnpkg.com/@wdio/config/-/config-7.7.3.tgz#b40862ee04ac0917170baf2a248c9404762c7bfb" - integrity sha512-I8gkb5BjXLe6/9NK7OCA9Mc+A6xeGUqbYTRd4PNKdObE6HomKOxw4plVZCYF0DlD2FCo4OGrvYGmalojFsCMdA== +"@wdio/config@7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@wdio/config/-/config-7.26.0.tgz#56710cf7cf2e5a60eafd91d7a399e49a028b6eb8" + integrity sha512-GO6kFGgFrx2Hiq+Ww6V9I7cZfShPjfPVhPy3uXnKN2B4FilX8ilLAp5cIFuMuHPeOQq0crYX9cnLYXka6dCGgg== dependencies: - "@wdio/logger" "7.7.0" - "@wdio/types" "7.7.3" + "@wdio/logger" "7.26.0" + "@wdio/types" "7.26.0" + "@wdio/utils" "7.26.0" deepmerge "^4.0.0" - glob "^7.1.2" + glob "^8.0.3" "@wdio/devtools-service@^7.20.5": version "7.20.5" @@ -996,10 +992,10 @@ loglevel-plugin-prefix "^0.8.4" strip-ansi "^6.0.0" -"@wdio/logger@7.7.0": - version "7.7.0" - resolved "https://registry.yarnpkg.com/@wdio/logger/-/logger-7.7.0.tgz#cac834008b7570f3b6ae30ed731545618c51da40" - integrity sha512-XX/OkC8NlvsBdhKsb9j7ZbuQtF/Vuo0xf38PXdqYtVezOrYbDuba0hPG++g/IGNuAF34ZbSi+49cvz4u5w92kQ== +"@wdio/logger@7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@wdio/logger/-/logger-7.26.0.tgz#2c105a00f63a81d52de969fef5a54a9035146b2d" + integrity sha512-kQj9s5JudAG9qB+zAAcYGPHVfATl2oqKgqj47yjehOQ1zzG33xmtL1ArFbQKWhDG32y1A8sN6b0pIqBEIwgg8Q== dependencies: chalk "^4.0.0" loglevel "^1.6.0" @@ -1070,19 +1066,19 @@ webdriver "7.20.4" webdriverio "7.20.5" -"@wdio/selenium-standalone-service@7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@wdio/selenium-standalone-service/-/selenium-standalone-service-7.7.4.tgz#776db2c7f29970d0c618c726cb29c0eb40cb2640" - integrity sha512-sAfhW8OU9Z7qpK0/6jxcNelmb8l36hOvFOVol4j/qhF8e3sv24W4Cnzh0oekSrcwmeiATtvVitGr55zuDDv3iQ== +"@wdio/selenium-standalone-service@^7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@wdio/selenium-standalone-service/-/selenium-standalone-service-7.26.0.tgz#80e8049d45988313df7147d3f9ce8bcae3681461" + integrity sha512-bP79aBzRBvgNCaJihLaQT/Qxa604o8UsAv9Ce2tARlVb4jFjpGH0w/xkuxUTqSpeQy/Sj+3hLExhNh1YgLe/Bg== dependencies: "@types/fs-extra" "^9.0.1" - "@types/node" "^14.14.31" + "@types/node" "^18.0.0" "@types/selenium-standalone" "^7.0.0" - "@wdio/config" "7.7.3" - "@wdio/logger" "7.7.0" - "@wdio/types" "7.7.3" + "@wdio/config" "7.26.0" + "@wdio/logger" "7.26.0" + "@wdio/types" "7.26.0" fs-extra "^10.0.0" - selenium-standalone "^7.0.1" + selenium-standalone "^8.0.3" "@wdio/types@7.20.3": version "7.20.3" @@ -1092,12 +1088,12 @@ "@types/node" "^18.0.0" got "^11.8.1" -"@wdio/types@7.7.3": - version "7.7.3" - resolved "https://registry.yarnpkg.com/@wdio/types/-/types-7.7.3.tgz#b92380a575d66d5f9c43b4b3c57f9311295f7545" - integrity sha512-ZZBQHCXKjZSQj9pf4df/QhfgQQj0vzm9hkK7YyNM+S+qnW0LExL8qQKLxTlGHDaYxk/+Jrd9pcZrJXRCoSnUaA== +"@wdio/types@7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@wdio/types/-/types-7.26.0.tgz#70bc879c5dbe316a0eebbac4a46f0f66430b1d84" + integrity sha512-mOTfWAGQ+iT58iaZhJMwlUkdEn3XEWE4jthysMLXFnSuZ2eaODVAiK31SmlS/eUqgSIaupeGqYUrtCuSNbLefg== dependencies: - "@types/node" "^14.14.31" + "@types/node" "^18.0.0" got "^11.8.1" "@wdio/utils@7.20.3": @@ -1109,6 +1105,15 @@ "@wdio/types" "7.20.3" p-iteration "^1.1.8" +"@wdio/utils@7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@wdio/utils/-/utils-7.26.0.tgz#e282d072ccbacbe583f6d1b192c0320cede170c1" + integrity sha512-pVq2MPXZAYLkKGKIIHktHejnHqg4TYKoNYSi2EDv+I3GlT8VZKXHazKhci82ov0tD+GdF27+s4DWNDCfGYfBdQ== + dependencies: + "@wdio/logger" "7.26.0" + "@wdio/types" "7.26.0" + p-iteration "^1.1.8" + JSONStream@^1.0.4, JSONStream@^1.3.5: version "1.3.5" resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" @@ -1992,16 +1997,16 @@ command-line-usage@^6.1.1: table-layout "^1.0.1" typical "^5.2.0" -commander@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" - integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== - commander@^8.3.0: version "8.3.0" resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== +commander@^9.0.0: + version "9.4.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd" + integrity sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw== + common-log-format@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/common-log-format/-/common-log-format-1.0.0.tgz#0ecfb959ca637b44a9c3e6e08a3bee3e9db67f3f" @@ -3382,18 +3387,6 @@ glob@^7.0.0, glob@^7.1.3, glob@^7.1.4, glob@~7.1.1: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.2: - version "7.2.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.1.1" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@^8.0.3: version "8.0.3" resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e" @@ -5038,13 +5031,6 @@ minimatch@5.0.1, minimatch@^5.0.0: dependencies: brace-expansion "^2.0.1" -minimatch@^3.1.1: - version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== - dependencies: - brace-expansion "^1.1.7" - minimatch@^5.0.1: version "5.1.0" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7" @@ -6115,12 +6101,12 @@ safe-buffer@^5.1.0, safe-buffer@~5.2.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -selenium-standalone@^7.0.1: - version "7.1.0" - resolved "https://registry.yarnpkg.com/selenium-standalone/-/selenium-standalone-7.1.0.tgz#1192a4ad84f114137dd5deadcb81b0f56afe054a" - integrity sha512-Pc7U48qwB4LVy/XczBrPPXwUhEPl3XQSik8SjLfj2qzBEtZqrjyzOlnnXq4aVCdr5wH9FiFJm8LwheJbK2+/oQ== +selenium-standalone@^8.0.3: + version "8.2.4" + resolved "https://registry.yarnpkg.com/selenium-standalone/-/selenium-standalone-8.2.4.tgz#c83942a1c93e1a27bb92bf681d700934b1c55ca3" + integrity sha512-VXkiQFAmXGlcE6X5A9dakXbXuxJONqG/t39Cw4ylk7J+hxIYBk/yfJ0Tkh2P0X9QGRpcUfr0hgE0PHDil0nFiA== dependencies: - commander "^7.2.0" + commander "^9.0.0" cross-spawn "^7.0.3" debug "^4.3.1" fs-extra "^10.0.0" From afafc4e48444801c53386f33f593d5f1a6b4c45d Mon Sep 17 00:00:00 2001 From: Felix Zilber Date: Wed, 23 Nov 2022 12:31:35 +0200 Subject: [PATCH 2/5] fix: conf update --- src/test/wdio.conf.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/test/wdio.conf.js b/src/test/wdio.conf.js index 6aeca9939..d87552264 100644 --- a/src/test/wdio.conf.js +++ b/src/test/wdio.conf.js @@ -18,6 +18,25 @@ const seleniumStandaloneArgs = { * */ exports.config = { +// ================================== + // Where should your test be launched + // ================================== + // + runner: 'local', + // + // ===================== + // Server Configurations + // ===================== + // Host address of the running Selenium server. This information is usually obsolete, as + // WebdriverIO automatically connects to localhost. Also if you are using one of the + // supported cloud services like Sauce Labs, Browserstack, Testing Bot or LambdaTest, you also don't + // need to define host and port information (because WebdriverIO can figure that out + // from your user and key information). However, if you are using a private Selenium + // backend, you should define the `hostname`, `port`, and `path` here. + // + hostname: 'localhost', + port: 4444, + path: '/', specs: ['./src/test/specs/**/*Spec.ts'], suites: { regression: ['./src/test/specs/**/*Spec.ts'] }, From f6f9a344c8d7b894c440fc25fc6fefb9e8d4fc66 Mon Sep 17 00:00:00 2001 From: Felix Zilber Date: Wed, 23 Nov 2022 12:32:34 +0200 Subject: [PATCH 3/5] fix: linter --- src/test/wdio.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/wdio.conf.js b/src/test/wdio.conf.js index d87552264..0f3781798 100644 --- a/src/test/wdio.conf.js +++ b/src/test/wdio.conf.js @@ -18,7 +18,7 @@ const seleniumStandaloneArgs = { * */ exports.config = { -// ================================== + // ================================== // Where should your test be launched // ================================== // From e11f0800a5f9655e310ff607ec7768b68255462f Mon Sep 17 00:00:00 2001 From: Felix Zilber Date: Wed, 23 Nov 2022 12:53:56 +0200 Subject: [PATCH 4/5] fix: workflows node and versions --- .github/workflows/ci-pr-merge.yml | 10 +++++----- .github/workflows/publish-package.yml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci-pr-merge.yml b/.github/workflows/ci-pr-merge.yml index fb660b65c..fd4d4f259 100644 --- a/.github/workflows/ci-pr-merge.yml +++ b/.github/workflows/ci-pr-merge.yml @@ -11,11 +11,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Use Node.js v14.15.1 - uses: actions/setup-node@v1 + - uses: actions/checkout@v3 + - name: Use Node.js v16 + uses: actions/setup-node@v3 with: - node-version: 14.15.1 + node-version: 16 - name: Install packages run: yarn install @@ -27,7 +27,7 @@ jobs: run: yarn test - name: Get Allure history - uses: actions/checkout@v2 + uses: actions/checkout@v3 if: always() continue-on-error: true with: diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml index b7584b4af..b20c1c719 100644 --- a/.github/workflows/publish-package.yml +++ b/.github/workflows/publish-package.yml @@ -13,13 +13,13 @@ jobs: if: "!contains(github.event.head_commit.message, 'chore(release)')" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: token: ${{ secrets.WDIO_TOKEN }} - - name: Use Node.js v14.15.1 - uses: actions/setup-node@v1 + - name: Use Node.js v16 + uses: actions/setup-node@v3 with: - node-version: 14.15.1 + node-version: 16 - name: Install packages run: yarn install @@ -45,7 +45,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: token: ${{ secrets.WDIO_TOKEN }} From bad51d4c6efe584b9b24756ed3a825dd4f71d735 Mon Sep 17 00:00:00 2001 From: Felix Zilber Date: Wed, 23 Nov 2022 13:11:32 +0200 Subject: [PATCH 5/5] fix: max instances --- src/test/wdio.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/wdio.conf.js b/src/test/wdio.conf.js index 0f3781798..e1283c6ca 100644 --- a/src/test/wdio.conf.js +++ b/src/test/wdio.conf.js @@ -3,7 +3,7 @@ const dotenv = require('dotenv'); const { Reporter } = require('../index'); dotenv.config(); -const maxChromeInstances = parseInt(process.env.MAX_CHROME_INSTANCES) || 10; +const maxChromeInstances = parseInt(process.env.MAX_CHROME_INSTANCES) || 5; const waitForTimeouts = parseInt(process.env.DEFAULT_TIME_OUT) || 3000; const seleniumStandaloneArgs = { drivers: {