diff options
author | Chocobozzz <me@florianbigard.com> | 2018-06-08 11:25:12 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-06-08 11:25:12 +0200 |
commit | 7cf26f433f5d93fb5325495bc87bdef87260aada (patch) | |
tree | 675e45abf0d63f20e3b6da9293ed5a32e0d1b1a4 /client/e2e | |
parent | dbe868c07080135cf62ecb8ad556d471c1e6c2ca (diff) | |
download | PeerTube-7cf26f433f5d93fb5325495bc87bdef87260aada.tar.gz PeerTube-7cf26f433f5d93fb5325495bc87bdef87260aada.tar.zst PeerTube-7cf26f433f5d93fb5325495bc87bdef87260aada.zip |
Fix e2e tests
Diffstat (limited to 'client/e2e')
-rw-r--r-- | client/e2e/protractor.conf.js | 21 | ||||
-rw-r--r-- | client/e2e/src/po/video-watch.po.ts | 2 | ||||
-rw-r--r-- | client/e2e/src/videos.e2e-spec.ts | 4 |
3 files changed, 17 insertions, 10 deletions
diff --git a/client/e2e/protractor.conf.js b/client/e2e/protractor.conf.js index 60b0ad904..c5c913a4a 100644 --- a/client/e2e/protractor.conf.js +++ b/client/e2e/protractor.conf.js | |||
@@ -18,35 +18,42 @@ exports.config = { | |||
18 | multiCapabilities: [ | 18 | multiCapabilities: [ |
19 | { | 19 | { |
20 | browserName: 'Chrome', | 20 | browserName: 'Chrome', |
21 | version: '66' | 21 | version: '66', |
22 | name: 'Latest Chrome Desktop' | ||
22 | }, | 23 | }, |
23 | { | 24 | { |
24 | browserName: 'Safari', | 25 | browserName: 'Safari', |
25 | version: '11.1' | 26 | version: '11.1', |
27 | name: 'Safari Desktop' | ||
26 | }, | 28 | }, |
27 | { | 29 | { |
28 | browserName: 'Firefox', | 30 | browserName: 'Firefox', |
29 | version: '52' // ESR | 31 | version: '52', // ESR, |
32 | name: 'Old Firefox ESR Desktop' | ||
30 | }, | 33 | }, |
31 | { | 34 | { |
32 | browserName: 'Firefox', | 35 | browserName: 'Firefox', |
33 | version: '60' | 36 | version: '60', |
37 | name: 'Latest Firefox Desktop' | ||
34 | }, | 38 | }, |
35 | { | 39 | { |
36 | browserName: 'Edge', | 40 | browserName: 'Edge', |
37 | version: '16' | 41 | version: '16', |
42 | name: 'Latest Edge Desktop' | ||
38 | }, | 43 | }, |
39 | { | 44 | { |
40 | browserName: 'Chrome', | 45 | browserName: 'Chrome', |
41 | device: 'Google Nexus 6', | 46 | device: 'Google Nexus 6', |
42 | realMobile: 'true', | 47 | realMobile: 'true', |
43 | os_version: '5.0' | 48 | os_version: '5.0', |
49 | name: 'Latest Chrome Android' | ||
44 | }, | 50 | }, |
45 | { | 51 | { |
46 | browserName: 'Safari', | 52 | browserName: 'Safari', |
47 | device: 'iPhone SE', | 53 | device: 'iPhone SE', |
48 | realMobile: 'true', | 54 | realMobile: 'true', |
49 | os_version: '11.2' | 55 | os_version: '11.2', |
56 | name: 'Latest Safari iPhone' | ||
50 | } | 57 | } |
51 | ], | 58 | ], |
52 | 59 | ||
diff --git a/client/e2e/src/po/video-watch.po.ts b/client/e2e/src/po/video-watch.po.ts index 5bb7e5694..fce8a6c3d 100644 --- a/client/e2e/src/po/video-watch.po.ts +++ b/client/e2e/src/po/video-watch.po.ts | |||
@@ -41,7 +41,7 @@ export class VideoWatchPage { | |||
41 | .then(seconds => parseInt(seconds, 10)) | 41 | .then(seconds => parseInt(seconds, 10)) |
42 | } | 42 | } |
43 | 43 | ||
44 | async pauseVideo (isAutoplay: boolean) { | 44 | async pauseVideo (isAutoplay: boolean, isMobileDevice: boolean) { |
45 | if (isAutoplay === false) { | 45 | if (isAutoplay === false) { |
46 | const playButton = element(by.css('.vjs-big-play-button')) | 46 | const playButton = element(by.css('.vjs-big-play-button')) |
47 | await browser.wait(browser.ExpectedConditions.elementToBeClickable(playButton)) | 47 | await browser.wait(browser.ExpectedConditions.elementToBeClickable(playButton)) |
diff --git a/client/e2e/src/videos.e2e-spec.ts b/client/e2e/src/videos.e2e-spec.ts index b15c03198..3d4d46292 100644 --- a/client/e2e/src/videos.e2e-spec.ts +++ b/client/e2e/src/videos.e2e-spec.ts | |||
@@ -66,14 +66,14 @@ describe('Videos workflow', () => { | |||
66 | }) | 66 | }) |
67 | 67 | ||
68 | it('Should play the video', async () => { | 68 | it('Should play the video', async () => { |
69 | await videoWatchPage.pauseVideo(!isMobileDevice) | 69 | await videoWatchPage.pauseVideo(!isMobileDevice, isMobileDevice) |
70 | expect(videoWatchPage.getWatchVideoPlayerCurrentTime()).toBeGreaterThanOrEqual(2) | 70 | expect(videoWatchPage.getWatchVideoPlayerCurrentTime()).toBeGreaterThanOrEqual(2) |
71 | }) | 71 | }) |
72 | 72 | ||
73 | it('Should watch the associated embed video', async () => { | 73 | it('Should watch the associated embed video', async () => { |
74 | await videoWatchPage.goOnAssociatedEmbed() | 74 | await videoWatchPage.goOnAssociatedEmbed() |
75 | 75 | ||
76 | await videoWatchPage.pauseVideo(false) | 76 | await videoWatchPage.pauseVideo(false, isMobileDevice) |
77 | expect(videoWatchPage.getWatchVideoPlayerCurrentTime()).toBeGreaterThanOrEqual(2) | 77 | expect(videoWatchPage.getWatchVideoPlayerCurrentTime()).toBeGreaterThanOrEqual(2) |
78 | }) | 78 | }) |
79 | }) | 79 | }) |