diff options
author | Chocobozzz <me@florianbigard.com> | 2018-05-22 16:02:29 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-05-22 16:02:29 +0200 |
commit | d1bd87e066633b8a66266b280327ec828980916b (patch) | |
tree | bfb30a565088cbb2675a8ab224b1ae1fc5dbfd16 /client/e2e/protractor.conf.js | |
parent | 293c885b5c6d4d694792cf430c51d73ecd1f3bee (diff) | |
download | PeerTube-d1bd87e066633b8a66266b280327ec828980916b.tar.gz PeerTube-d1bd87e066633b8a66266b280327ec828980916b.tar.zst PeerTube-d1bd87e066633b8a66266b280327ec828980916b.zip |
Make it works with new autoplay policy
Diffstat (limited to 'client/e2e/protractor.conf.js')
-rw-r--r-- | client/e2e/protractor.conf.js | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/client/e2e/protractor.conf.js b/client/e2e/protractor.conf.js index a4fd12473..5dcd77284 100644 --- a/client/e2e/protractor.conf.js +++ b/client/e2e/protractor.conf.js | |||
@@ -5,16 +5,14 @@ const {SpecReporter} = require('jasmine-spec-reporter') | |||
5 | 5 | ||
6 | exports.config = { | 6 | exports.config = { |
7 | allScriptsTimeout: 25000, | 7 | allScriptsTimeout: 25000, |
8 | specs: [ | 8 | specs: ['./src/**/*.e2e-spec.ts'], |
9 | './src/**/*.e2e-spec.ts' | ||
10 | ], | ||
11 | 9 | ||
12 | seleniumAddress: 'http://hub-cloud.browserstack.com/wd/hub', | 10 | seleniumAddress: 'http://hub-cloud.browserstack.com/wd/hub', |
13 | commonCapabilities: { | 11 | commonCapabilities: { |
14 | 'browserstack.user': process.env.BROWSERSTACK_USER, | 12 | 'browserstack.user': process.env.BROWSERSTACK_USER, |
15 | 'browserstack.key': process.env.BROWSERSTACK_KEY, | 13 | 'browserstack.key': process.env.BROWSERSTACK_KEY, |
16 | 'browserstack.local': true, | 14 | 'browserstack.local': true, |
17 | 'project': 'PeerTube' | 15 | projec: 'PeerTube' |
18 | }, | 16 | }, |
19 | 17 | ||
20 | multiCapabilities: [ | 18 | multiCapabilities: [ |
@@ -24,7 +22,8 @@ exports.config = { | |||
24 | }, | 22 | }, |
25 | { | 23 | { |
26 | browserName: 'Safari', | 24 | browserName: 'Safari', |
27 | version: '11.1' | 25 | version: '11.1', |
26 | resolution: '1920x1080' | ||
28 | }, | 27 | }, |
29 | { | 28 | { |
30 | browserName: 'Firefox', | 29 | browserName: 'Firefox', |
@@ -44,35 +43,29 @@ exports.config = { | |||
44 | realMobile: 'true', | 43 | realMobile: 'true', |
45 | os_version: '5.0' | 44 | os_version: '5.0' |
46 | }, | 45 | }, |
47 | // { | 46 | { |
48 | // browserName: 'Safari', | 47 | browserName: 'Safari', |
49 | // device: 'iPhone 6s', | 48 | device: 'iPhone SE', |
50 | // realMobile: 'true', | 49 | realMobile: 'true', |
51 | // os_version: '9.0' | 50 | os_version: '11.2' |
52 | // }, | 51 | } |
53 | // { | ||
54 | // browserName: 'Safari', | ||
55 | // device: 'iPhone SE', | ||
56 | // realMobile: 'true', | ||
57 | // os_version: '11.2' | ||
58 | // } | ||
59 | ], | 52 | ], |
60 | 53 | ||
61 | maxSessions: 1, | 54 | // maxSessions: 1, |
62 | // BrowserStack compatible ports: https://www.browserstack.com/question/664 | 55 | // BrowserStack compatible ports: https://www.browserstack.com/question/664 |
63 | baseUrl: 'http://localhost:3333/', | 56 | baseUrl: 'http://localhost:3333/', |
64 | framework: 'jasmine', | 57 | framework: 'jasmine', |
65 | jasmineNodeOpts: { | 58 | jasmineNodeOpts: { |
66 | showColors: true, | 59 | showColors: true, |
67 | defaultTimeoutInterval: 45000, | 60 | defaultTimeoutInterval: 45000, |
68 | print: function () {} | 61 | print: function() {} |
69 | }, | 62 | }, |
70 | 63 | ||
71 | onPrepare () { | 64 | onPrepare() { |
72 | require('ts-node').register({ | 65 | require('ts-node').register({ |
73 | project: require('path').join(__dirname, './tsconfig.e2e.json') | 66 | project: require('path').join(__dirname, './tsconfig.e2e.json') |
74 | }) | 67 | }) |
75 | jasmine.getEnv().addReporter(new SpecReporter({spec: {displayStacktrace: true}})) | 68 | jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })) |
76 | } | 69 | } |
77 | } | 70 | } |
78 | 71 | ||