Skip to content
Snippets Groups Projects
Commit 2354736c authored by David Dorchies's avatar David Dorchies
Browse files

Merge branch '648-ci-e2e-tests-are-not-working-since-docker-image-update' into 'devel' 

Resolve "CI: E2E tests are not working since docker image update"

Closes #648

See merge request !243
parents db8fd10e c0c60480
No related branches found
No related tags found
2 merge requests!252release: version 4.18.0,!243Resolve "CI: E2E tests are not working since docker image update"
Pipeline #161300 passed
Stage: install
    Stage: build
      Stage: clean-stale-branches
        Stage: deploy-dev
          Hide whitespace changes
          Inline Side-by-side
          package-lock.json
          + 1
          − 177
          View file @ 2354736c
          ...@@ -73,7 +73,6 @@ ...@@ -73,7 +73,6 @@
          "@wdio/jasmine-framework": "^8.8.2", "@wdio/jasmine-framework": "^8.8.2",
          "@wdio/local-runner": "^8.8.2", "@wdio/local-runner": "^8.8.2",
          "@wdio/spec-reporter": "^8.8.0", "@wdio/spec-reporter": "^8.8.0",
          "chromedriver": "^111.0.0",
          "codelyzer": "^6.0.2", "codelyzer": "^6.0.2",
          "electron": "^19.0.7", "electron": "^19.0.7",
          "electron-builder": "^23.1.0", "electron-builder": "^23.1.0",
          ...@@ -84,7 +83,6 @@ ...@@ -84,7 +83,6 @@
          "jasmine-spec-reporter": "~7.0.0", "jasmine-spec-reporter": "~7.0.0",
          "ts-node": "^10.8.2", "ts-node": "^10.8.2",
          "typescript": "~4.7.4", "typescript": "~4.7.4",
          "wdio-chromedriver-service": "^8.1.1",
          "wdio-wait-for": "^3.0.3", "wdio-wait-for": "^3.0.3",
          "webpack-dev-server": "^4.9.3" "webpack-dev-server": "^4.9.3"
          } }
          ...@@ -96,8 +94,7 @@ ...@@ -96,8 +94,7 @@
          "@types/base-64": "^1.0.0", "@types/base-64": "^1.0.0",
          "@types/lodash": "^4.14.191", "@types/lodash": "^4.14.191",
          "base-64": "^1.0.0", "base-64": "^1.0.0",
          "lodash": "^4.14.191", "lodash": "^4.14.191"
          "seedrandom": "^3.0.5"
          }, },
          "devDependencies": { "devDependencies": {
          "@types/jasmine": "^4.0.3", "@types/jasmine": "^4.0.3",
          ...@@ -5930,11 +5927,6 @@ ...@@ -5930,11 +5927,6 @@
          "node": ">=6" "node": ">=6"
          } }
          }, },
          "node_modules/@testim/chrome-version": {
          "version": "1.1.3",
          "dev": true,
          "license": "MIT"
          },
          "node_modules/@tootallnate/once": { "node_modules/@tootallnate/once": {
          "version": "2.0.0", "version": "2.0.0",
          "dev": true, "dev": true,
          ...@@ -8437,16 +8429,6 @@ ...@@ -8437,16 +8429,6 @@
          "optional": true, "optional": true,
          "peer": true "peer": true
          }, },
          "node_modules/axios": {
          "version": "1.3.5",
          "dev": true,
          "license": "MIT",
          "dependencies": {
          "follow-redirects": "^1.15.0",
          "form-data": "^4.0.0",
          "proxy-from-env": "^1.1.0"
          }
          },
          "node_modules/axobject-query": { "node_modules/axobject-query": {
          "version": "2.0.2", "version": "2.0.2",
          "dev": true, "dev": true,
          ...@@ -9870,60 +9852,6 @@ ...@@ -9870,60 +9852,6 @@
          "node": ">=6.0" "node": ">=6.0"
          } }
          }, },
          "node_modules/chromedriver": {
          "version": "111.0.0",
          "dev": true,
          "hasInstallScript": true,
          "license": "Apache-2.0",
          "dependencies": {
          "@testim/chrome-version": "^1.1.3",
          "axios": "^1.2.1",
          "compare-versions": "^5.0.1",
          "extract-zip": "^2.0.1",
          "https-proxy-agent": "^5.0.1",
          "proxy-from-env": "^1.1.0",
          "tcp-port-used": "^1.0.1"
          },
          "bin": {
          "chromedriver": "bin/chromedriver"
          },
          "engines": {
          "node": ">=14"
          }
          },
          "node_modules/chromedriver/node_modules/extract-zip": {
          "version": "2.0.1",
          "dev": true,
          "license": "BSD-2-Clause",
          "dependencies": {
          "debug": "^4.1.1",
          "get-stream": "^5.1.0",
          "yauzl": "^2.10.0"
          },
          "bin": {
          "extract-zip": "cli.js"
          },
          "engines": {
          "node": ">= 10.17.0"
          },
          "optionalDependencies": {
          "@types/yauzl": "^2.9.1"
          }
          },
          "node_modules/chromedriver/node_modules/get-stream": {
          "version": "5.2.0",
          "dev": true,
          "license": "MIT",
          "dependencies": {
          "pump": "^3.0.0"
          },
          "engines": {
          "node": ">=8"
          },
          "funding": {
          "url": "https://github.com/sponsors/sindresorhus"
          }
          },
          "node_modules/chromium-bidi": { "node_modules/chromium-bidi": {
          "version": "0.4.6", "version": "0.4.6",
          "devOptional": true, "devOptional": true,
          ...@@ -10307,11 +10235,6 @@ ...@@ -10307,11 +10235,6 @@
          "node": ">=0.10.0" "node": ">=0.10.0"
          } }
          }, },
          "node_modules/compare-versions": {
          "version": "5.0.3",
          "dev": true,
          "license": "MIT"
          },
          "node_modules/component-emitter": { "node_modules/component-emitter": {
          "version": "1.3.0", "version": "1.3.0",
          "license": "MIT" "license": "MIT"
          ...@@ -15797,14 +15720,6 @@ ...@@ -15797,14 +15720,6 @@
          "dev": true, "dev": true,
          "license": "MIT" "license": "MIT"
          }, },
          "node_modules/ip-regex": {
          "version": "4.3.0",
          "dev": true,
          "license": "MIT",
          "engines": {
          "node": ">=8"
          }
          },
          "node_modules/ipaddr.js": { "node_modules/ipaddr.js": {
          "version": "1.9.1", "version": "1.9.1",
          "license": "MIT", "license": "MIT",
          ...@@ -16228,11 +16143,6 @@ ...@@ -16228,11 +16143,6 @@
          "url": "https://github.com/sponsors/sindresorhus" "url": "https://github.com/sponsors/sindresorhus"
          } }
          }, },
          "node_modules/is-url": {
          "version": "1.2.4",
          "dev": true,
          "license": "MIT"
          },
          "node_modules/is-utf8": { "node_modules/is-utf8": {
          "version": "0.2.1", "version": "0.2.1",
          "dev": true, "dev": true,
          ...@@ -16290,19 +16200,6 @@ ...@@ -16290,19 +16200,6 @@
          "node": ">=8" "node": ">=8"
          } }
          }, },
          "node_modules/is2": {
          "version": "2.0.9",
          "dev": true,
          "license": "MIT",
          "dependencies": {
          "deep-is": "^0.1.3",
          "ip-regex": "^4.1.0",
          "is-url": "^1.2.4"
          },
          "engines": {
          "node": ">=v0.10.0"
          }
          },
          "node_modules/isarray": { "node_modules/isarray": {
          "version": "1.0.0", "version": "1.0.0",
          "license": "MIT" "license": "MIT"
          ...@@ -22054,11 +21951,6 @@ ...@@ -22054,11 +21951,6 @@
          "version": "3.0.1", "version": "3.0.1",
          "license": "MIT" "license": "MIT"
          }, },
          "node_modules/seedrandom": {
          "version": "3.0.5",
          "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
          "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg=="
          },
          "node_modules/select": { "node_modules/select": {
          "version": "1.1.2", "version": "1.1.2",
          "license": "MIT" "license": "MIT"
          ...@@ -23706,31 +23598,6 @@ ...@@ -23706,31 +23598,6 @@
          "node": ">= 6" "node": ">= 6"
          } }
          }, },
          "node_modules/tcp-port-used": {
          "version": "1.0.2",
          "dev": true,
          "license": "MIT",
          "dependencies": {
          "debug": "4.3.1",
          "is2": "^2.0.6"
          }
          },
          "node_modules/tcp-port-used/node_modules/debug": {
          "version": "4.3.1",
          "dev": true,
          "license": "MIT",
          "dependencies": {
          "ms": "2.1.2"
          },
          "engines": {
          "node": ">=6.0"
          },
          "peerDependenciesMeta": {
          "supports-color": {
          "optional": true
          }
          }
          },
          "node_modules/temp": { "node_modules/temp": {
          "version": "0.8.4", "version": "0.8.4",
          "license": "MIT", "license": "MIT",
          ...@@ -24840,49 +24707,6 @@ ...@@ -24840,49 +24707,6 @@
          "defaults": "^1.0.3" "defaults": "^1.0.3"
          } }
          }, },
          "node_modules/wdio-chromedriver-service": {
          "version": "8.1.1",
          "dev": true,
          "license": "MIT",
          "dependencies": {
          "@wdio/logger": "^8.1.0",
          "fs-extra": "^11.1.0",
          "split2": "^4.1.0",
          "tcp-port-used": "^1.0.2"
          },
          "engines": {
          "node": "^16.13 || >=18"
          },
          "peerDependencies": {
          "@wdio/types": "^7.0.0 || ^8.0.0-alpha.219",
          "chromedriver": "*",
          "webdriverio": "^7.0.0 || ^8.0.0-alpha.219"
          },
          "peerDependenciesMeta": {
          "@wdio/types": {
          "optional": true
          },
          "chromedriver": {
          "optional": true
          },
          "webdriverio": {
          "optional": false
          }
          }
          },
          "node_modules/wdio-chromedriver-service/node_modules/fs-extra": {
          "version": "11.1.1",
          "dev": true,
          "license": "MIT",
          "dependencies": {
          "graceful-fs": "^4.2.0",
          "jsonfile": "^6.0.1",
          "universalify": "^2.0.0"
          },
          "engines": {
          "node": ">=14.14"
          }
          },
          "node_modules/wdio-wait-for": { "node_modules/wdio-wait-for": {
          "version": "3.0.3", "version": "3.0.3",
          "dev": true, "dev": true,
          ......
          wdio.conf.ts
          + 13
          − 16
          View file @ 2354736c
          ...@@ -33,7 +33,7 @@ export const config: Options.Testrunner = { ...@@ -33,7 +33,7 @@ export const config: Options.Testrunner = {
          // will be called from there. // will be called from there.
          // //
          specs: [ specs: [
          './e2e/**/*.ts' './e2e/**/*e2e-spec.ts'
          ], ],
          // Patterns to exclude. // Patterns to exclude.
          exclude: [ exclude: [
          ...@@ -106,8 +106,8 @@ export const config: Options.Testrunner = { ...@@ -106,8 +106,8 @@ export const config: Options.Testrunner = {
          // - @wdio/cli, @wdio/config, @wdio/utils // - @wdio/cli, @wdio/config, @wdio/utils
          // Level of logging verbosity: trace | debug | info | warn | error | silent // Level of logging verbosity: trace | debug | info | warn | error | silent
          // logLevels: { // logLevels: {
          // webdriver: 'info', // webdriver: 'trace',
          // '@wdio/appium-service': 'info' // '@wdio/jasmine-framework': 'trace'
          // }, // },
          // //
          // If you only want to run your tests until a specific amount of tests have failed use // If you only want to run your tests until a specific amount of tests have failed use
          ...@@ -135,15 +135,15 @@ export const config: Options.Testrunner = { ...@@ -135,15 +135,15 @@ export const config: Options.Testrunner = {
          // your test setup with almost no effort. Unlike plugins, they don't add new // your test setup with almost no effort. Unlike plugins, they don't add new
          // commands. Instead, they hook themselves up into the test process. // commands. Instead, they hook themselves up into the test process.
          // args: ["--verbose", "--whitelisted-ips="] // args: ["--verbose", "--whitelisted-ips="]
          services: [ // services: [
          ['chromedriver', // ['chromedriver',
          { // {
          chromedriverCustomPath: "/usr/bin/chromedriver", // chromedriverCustomPath: "/usr/bin/chromedriver",
          args: ["--whitelisted-ips=127.0.0.1"] // args: ["--verbose", "--whitelisted-ips=127.0.0.1"]
          } // }
          ] // ]
          ], // ],
          //
          // Framework you want to run your specs with. // Framework you want to run your specs with.
          // The following are supported: Mocha, Jasmine, and Cucumber // The following are supported: Mocha, Jasmine, and Cucumber
          // see also: https://webdriver.io/docs/frameworks // see also: https://webdriver.io/docs/frameworks
          ...@@ -165,14 +165,11 @@ export const config: Options.Testrunner = { ...@@ -165,14 +165,11 @@ export const config: Options.Testrunner = {
          // The only one supported by default is 'dot' // The only one supported by default is 'dot'
          // see also: https://webdriver.io/docs/dot-reporter // see also: https://webdriver.io/docs/dot-reporter
          reporters: ['spec'], reporters: ['spec'],
          // //
          // Options to be passed to Jasmine. // Options to be passed to Jasmine.
          jasmineOpts: { jasmineOpts: {
          // Jasmine default timeout // Jasmine default timeout
          defaultTimeoutInterval: 60000, defaultTimeoutInterval: 180000,
          // //
          // The Jasmine framework allows interception of each assertion in order to log the state of the application // The Jasmine framework allows interception of each assertion in order to log the state of the application
          // or website depending on the result. For example, it is pretty handy to take a screenshot every time // or website depending on the result. For example, it is pretty handy to take a screenshot every time
          ......
          0% or .
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment