From cb9edb310f17f933a61f390a2f82ca41db798e13 Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@inrae.fr>
Date: Thu, 11 Jan 2024 13:29:56 +0000
Subject: [PATCH 1/7] tests: trace wdio on CI
Refs #648
---
.gitlab-ci.yml | 5 -----
wdio.conf.ts | 12 ++++++------
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 978211c5c..07dd1f879 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,11 +60,6 @@ install:
test:
stage: test
- only:
- - tags
- - schedules
- - web
- - master
script:
- npm run e2e
diff --git a/wdio.conf.ts b/wdio.conf.ts
index f6714da3c..654fa4a6d 100644
--- a/wdio.conf.ts
+++ b/wdio.conf.ts
@@ -93,7 +93,7 @@ export const config: Options.Testrunner = {
//
// Level of logging verbosity: trace | debug | info | warn | error | silent
// logLevel: 'info',
- logLevel: 'warn',
+ logLevel: 'trace',
// logLevel: 'error',
//
// Set specific log levels per logger
@@ -105,10 +105,10 @@ export const config: Options.Testrunner = {
// - @wdio/sumologic-reporter
// - @wdio/cli, @wdio/config, @wdio/utils
// Level of logging verbosity: trace | debug | info | warn | error | silent
- // logLevels: {
- // webdriver: 'info',
- // '@wdio/appium-service': 'info'
- // },
+ logLevels: {
+ webdriver: 'trace',
+ '@wdio/jasmine-framework': 'trace'
+ },
//
// If you only want to run your tests until a specific amount of tests have failed use
// bail (default is 0 - don't bail, run all tests).
@@ -139,7 +139,7 @@ export const config: Options.Testrunner = {
['chromedriver',
{
chromedriverCustomPath: "/usr/bin/chromedriver",
- args: ["--whitelisted-ips=127.0.0.1"]
+ args: ["--verbose", "--whitelisted-ips=127.0.0.1"]
}
]
],
--
GitLab
From b3338463db647b53d2281cb9166d6bb7efbcf717 Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@inrae.fr>
Date: Thu, 11 Jan 2024 14:42:07 +0000
Subject: [PATCH 2/7] fix(e2e): Use wdio browser autoconfiguration instead of
manual install
Refs #648
---
wdio.conf.ts | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/wdio.conf.ts b/wdio.conf.ts
index 654fa4a6d..995786a63 100644
--- a/wdio.conf.ts
+++ b/wdio.conf.ts
@@ -135,15 +135,15 @@ export const config: Options.Testrunner = {
// your test setup with almost no effort. Unlike plugins, they don't add new
// commands. Instead, they hook themselves up into the test process.
// args: ["--verbose", "--whitelisted-ips="]
- services: [
- ['chromedriver',
- {
- chromedriverCustomPath: "/usr/bin/chromedriver",
- args: ["--verbose", "--whitelisted-ips=127.0.0.1"]
- }
- ]
- ],
-
+ // services: [
+ // ['chromedriver',
+ // {
+ // chromedriverCustomPath: "/usr/bin/chromedriver",
+ // args: ["--verbose", "--whitelisted-ips=127.0.0.1"]
+ // }
+ // ]
+ // ],
+ //
// Framework you want to run your specs with.
// The following are supported: Mocha, Jasmine, and Cucumber
// see also: https://webdriver.io/docs/frameworks
--
GitLab
From 80d2bd5cc874b594dffc056e50d372d48fc5c36b Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@inrae.fr>
Date: Thu, 11 Jan 2024 15:11:44 +0000
Subject: [PATCH 3/7] clean(e2e): remove unnecessary files in specs
Refs #648
---
wdio.conf.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/wdio.conf.ts b/wdio.conf.ts
index 995786a63..82a6e07c0 100644
--- a/wdio.conf.ts
+++ b/wdio.conf.ts
@@ -33,7 +33,7 @@ export const config: Options.Testrunner = {
// will be called from there.
//
specs: [
- './e2e/**/*.ts'
+ './e2e/**/*e2e-spec.ts'
],
// Patterns to exclude.
exclude: [
--
GitLab
From fedc159588b4c31bdc721655f399d11a7eba9601 Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@inrae.fr>
Date: Thu, 11 Jan 2024 15:12:32 +0000
Subject: [PATCH 4/7] clean(e2e): remove unnecessary packages
Refs #648
---
package-lock.json | 178 +---------------------------------------------
package.json | 2 -
2 files changed, 1 insertion(+), 179 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 4ddbbf852..e915f2a39 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -73,7 +73,6 @@
"@wdio/jasmine-framework": "^8.8.2",
"@wdio/local-runner": "^8.8.2",
"@wdio/spec-reporter": "^8.8.0",
- "chromedriver": "^111.0.0",
"codelyzer": "^6.0.2",
"electron": "^19.0.7",
"electron-builder": "^23.1.0",
@@ -84,7 +83,6 @@
"jasmine-spec-reporter": "~7.0.0",
"ts-node": "^10.8.2",
"typescript": "~4.7.4",
- "wdio-chromedriver-service": "^8.1.1",
"wdio-wait-for": "^3.0.3",
"webpack-dev-server": "^4.9.3"
}
@@ -96,8 +94,7 @@
"@types/base-64": "^1.0.0",
"@types/lodash": "^4.14.191",
"base-64": "^1.0.0",
- "lodash": "^4.14.191",
- "seedrandom": "^3.0.5"
+ "lodash": "^4.14.191"
},
"devDependencies": {
"@types/jasmine": "^4.0.3",
@@ -5930,11 +5927,6 @@
"node": ">=6"
}
},
- "node_modules/@testim/chrome-version": {
- "version": "1.1.3",
- "dev": true,
- "license": "MIT"
- },
"node_modules/@tootallnate/once": {
"version": "2.0.0",
"dev": true,
@@ -8437,16 +8429,6 @@
"optional": 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": {
"version": "2.0.2",
"dev": true,
@@ -9870,60 +9852,6 @@
"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": {
"version": "0.4.6",
"devOptional": true,
@@ -10307,11 +10235,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/compare-versions": {
- "version": "5.0.3",
- "dev": true,
- "license": "MIT"
- },
"node_modules/component-emitter": {
"version": "1.3.0",
"license": "MIT"
@@ -15797,14 +15720,6 @@
"dev": true,
"license": "MIT"
},
- "node_modules/ip-regex": {
- "version": "4.3.0",
- "dev": true,
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/ipaddr.js": {
"version": "1.9.1",
"license": "MIT",
@@ -16228,11 +16143,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/is-url": {
- "version": "1.2.4",
- "dev": true,
- "license": "MIT"
- },
"node_modules/is-utf8": {
"version": "0.2.1",
"dev": true,
@@ -16290,19 +16200,6 @@
"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": {
"version": "1.0.0",
"license": "MIT"
@@ -22054,11 +21951,6 @@
"version": "3.0.1",
"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": {
"version": "1.1.2",
"license": "MIT"
@@ -23706,31 +23598,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": {
"version": "0.8.4",
"license": "MIT",
@@ -24840,49 +24707,6 @@
"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": {
"version": "3.0.3",
"dev": true,
diff --git a/package.json b/package.json
index dd8296c55..801b67750 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,6 @@
"@wdio/jasmine-framework": "^8.8.2",
"@wdio/local-runner": "^8.8.2",
"@wdio/spec-reporter": "^8.8.0",
- "chromedriver": "^111.0.0",
"codelyzer": "^6.0.2",
"electron": "^19.0.7",
"electron-builder": "^23.1.0",
@@ -114,7 +113,6 @@
"jasmine-spec-reporter": "~7.0.0",
"ts-node": "^10.8.2",
"typescript": "~4.7.4",
- "wdio-chromedriver-service": "^8.1.1",
"wdio-wait-for": "^3.0.3",
"webpack-dev-server": "^4.9.3"
}
--
GitLab
From d766d16d2a383f19d8c887fb88967ea4b6aac143 Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@inrae.fr>
Date: Thu, 11 Jan 2024 15:38:00 +0000
Subject: [PATCH 5/7] fix(e2e): raise Jasmine defaultTimeoutInterval
Refs #648
---
wdio.conf.ts | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/wdio.conf.ts b/wdio.conf.ts
index 82a6e07c0..4a49195dd 100644
--- a/wdio.conf.ts
+++ b/wdio.conf.ts
@@ -165,14 +165,11 @@ export const config: Options.Testrunner = {
// The only one supported by default is 'dot'
// see also: https://webdriver.io/docs/dot-reporter
reporters: ['spec'],
-
-
-
//
// Options to be passed to Jasmine.
jasmineOpts: {
// Jasmine default timeout
- defaultTimeoutInterval: 60000,
+ defaultTimeoutInterval: 180000,
//
// 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
--
GitLab
From 049173c7d9155afe64f5130204836bc2fa0aa3c4 Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@inrae.fr>
Date: Thu, 11 Jan 2024 16:08:52 +0000
Subject: [PATCH 6/7] chore(e2e): remove debug trace
Refs #648
---
wdio.conf.ts | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/wdio.conf.ts b/wdio.conf.ts
index 4a49195dd..a2eef4a62 100644
--- a/wdio.conf.ts
+++ b/wdio.conf.ts
@@ -93,7 +93,7 @@ export const config: Options.Testrunner = {
//
// Level of logging verbosity: trace | debug | info | warn | error | silent
// logLevel: 'info',
- logLevel: 'trace',
+ logLevel: 'warn',
// logLevel: 'error',
//
// Set specific log levels per logger
@@ -105,10 +105,10 @@ export const config: Options.Testrunner = {
// - @wdio/sumologic-reporter
// - @wdio/cli, @wdio/config, @wdio/utils
// Level of logging verbosity: trace | debug | info | warn | error | silent
- logLevels: {
- webdriver: 'trace',
- '@wdio/jasmine-framework': 'trace'
- },
+ // logLevels: {
+ // webdriver: 'trace',
+ // '@wdio/jasmine-framework': 'trace'
+ // },
//
// If you only want to run your tests until a specific amount of tests have failed use
// bail (default is 0 - don't bail, run all tests).
--
GitLab
From c0c6048041f68bd8e4b6593b829e237019535e9a Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@inrae.fr>
Date: Thu, 11 Jan 2024 16:55:04 +0000
Subject: [PATCH 7/7] chore: revert e2e testing in dev branches
Finish to revert cb9edb310f17f933a61f390a2f82ca41db798e13
Refs #648
---
.gitlab-ci.yml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07dd1f879..978211c5c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,6 +60,11 @@ install:
test:
stage: test
+ only:
+ - tags
+ - schedules
+ - web
+ - master
script:
- npm run e2e
--
GitLab