aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-03-04 10:53:38 +0100
committerChocobozzz <me@florianbigard.com>2021-03-04 10:53:38 +0100
commit3473e2102aab5339e40e7b5067dcae178f777d3a (patch)
treeaa9a3c28ec8dd020ba37d409599719ce7ccd2bde
parent919b16ba307e738c0897972dc10295b36a88c58f (diff)
downloadPeerTube-3473e2102aab5339e40e7b5067dcae178f777d3a.tar.gz
PeerTube-3473e2102aab5339e40e7b5067dcae178f777d3a.tar.zst
PeerTube-3473e2102aab5339e40e7b5067dcae178f777d3a.zip
Update protractor confg
-rw-r--r--client/e2e/local-protractor.conf.js34
-rw-r--r--client/e2e/protractor.conf.js2
2 files changed, 27 insertions, 9 deletions
diff --git a/client/e2e/local-protractor.conf.js b/client/e2e/local-protractor.conf.js
index 16f039025..6120dab8c 100644
--- a/client/e2e/local-protractor.conf.js
+++ b/client/e2e/local-protractor.conf.js
@@ -9,16 +9,34 @@ exports.config = {
9 9
10 directConnect: true, 10 directConnect: true,
11 11
12 capabilities: { 12 multiCapabilities: [
13 'browserName': 'firefox', 13 {
14 'moz:firefoxOptions': { 14 'browserName': 'firefox',
15 binary: '/usr/bin/firefox-developer-edition', 15 'name': 'Firefox',
16 // args: ["-headless"], 16 'moz:firefoxOptions': {
17 log: { 17 binary: '/usr/bin/firefox-developer-edition',
18 "level": "info" // default is "info" 18 // args: ["-headless"],
19 log: {
20 "level": "info" // default is "info"
21 }
19 } 22 }
23 },
24 {
25 'browserName': 'firefox',
26 'name': 'Firefox ESR',
27 'moz:firefoxOptions': {
28 binary: '/usr/bin/firefox-esr',
29 // args: ["-headless"],
30 log: {
31 "level": "info" // default is "info"
32 }
33 }
34 },
35 {
36 'browserName': 'chrome',
37 'name': 'Chromium'
20 } 38 }
21 }, 39 ],
22 40
23 // maxSessions: 1, 41 // maxSessions: 1,
24 baseUrl: 'http://localhost:3000/', 42 baseUrl: 'http://localhost:3000/',
diff --git a/client/e2e/protractor.conf.js b/client/e2e/protractor.conf.js
index 2b26d2c40..e5a23e16a 100644
--- a/client/e2e/protractor.conf.js
+++ b/client/e2e/protractor.conf.js
@@ -34,7 +34,7 @@ exports.config = {
34 }, 34 },
35 { 35 {
36 browserName: 'Firefox', 36 browserName: 'Firefox',
37 version: '60', // ESR, 37 version: '68', // ESR
38 name: 'Firefox ESR Desktop', 38 name: 'Firefox ESR Desktop',
39 resolution: '1280x1024' 39 resolution: '1280x1024'
40 }, 40 },