diff options
Diffstat (limited to 'client')
-rw-r--r-- | client/e2e/protractor.conf.js | 7 | ||||
-rw-r--r-- | client/e2e/src/po/player.po.ts | 4 | ||||
-rw-r--r-- | client/e2e/src/videos.e2e-spec.ts | 8 |
3 files changed, 15 insertions, 4 deletions
diff --git a/client/e2e/protractor.conf.js b/client/e2e/protractor.conf.js index 3797961ff..47585afc5 100644 --- a/client/e2e/protractor.conf.js +++ b/client/e2e/protractor.conf.js | |||
@@ -61,6 +61,13 @@ exports.config = { | |||
61 | realMobile: 'true', | 61 | realMobile: 'true', |
62 | os_version: '12', | 62 | os_version: '12', |
63 | name: 'Safari iPhone' | 63 | name: 'Safari iPhone' |
64 | }, | ||
65 | { | ||
66 | browserName: 'Safari', | ||
67 | device: 'iPad 7th', | ||
68 | realMobile: 'true', | ||
69 | os_version: '13', | ||
70 | name: 'Safari iPad' | ||
64 | } | 71 | } |
65 | ], | 72 | ], |
66 | 73 | ||
diff --git a/client/e2e/src/po/player.po.ts b/client/e2e/src/po/player.po.ts index c03f20c68..bc61704fb 100644 --- a/client/e2e/src/po/player.po.ts +++ b/client/e2e/src/po/player.po.ts | |||
@@ -28,11 +28,11 @@ export class PlayerPage { | |||
28 | const videojsEl = element(by.css('div.video-js')) | 28 | const videojsEl = element(by.css('div.video-js')) |
29 | await browser.wait(browser.ExpectedConditions.elementToBeClickable(videojsEl)) | 29 | await browser.wait(browser.ExpectedConditions.elementToBeClickable(videojsEl)) |
30 | 30 | ||
31 | // On Android, we need to click twice on "play" (BrowserStack particularity) | ||
32 | if (await isMobileDevice()) { | 31 | if (await isMobileDevice()) { |
33 | await browserSleep(5000) | 32 | await browserSleep(5000) |
34 | 33 | ||
35 | await videojsEl.click() | 34 | // On Android, we need to click twice on "play" (BrowserStack particularity) |
35 | if (!await isIOS()) await videojsEl.click() | ||
36 | } | 36 | } |
37 | 37 | ||
38 | browser.ignoreSynchronization = false | 38 | browser.ignoreSynchronization = false |
diff --git a/client/e2e/src/videos.e2e-spec.ts b/client/e2e/src/videos.e2e-spec.ts index 97d1b827c..d8af1885f 100644 --- a/client/e2e/src/videos.e2e-spec.ts +++ b/client/e2e/src/videos.e2e-spec.ts | |||
@@ -93,8 +93,12 @@ describe('Videos workflow', () => { | |||
93 | it('Should go on video watch page', async () => { | 93 | it('Should go on video watch page', async () => { |
94 | let videoNameToExcept = videoName | 94 | let videoNameToExcept = videoName |
95 | 95 | ||
96 | if (await isMobileDevice() || await isSafari()) videoNameToExcept = await videoWatchPage.clickOnFirstVideo() | 96 | if (await isMobileDevice() || await isSafari()) { |
97 | else await videoWatchPage.clickOnVideo(videoName) | 97 | await browser.get('https://peertube2.cpy.re/videos/watch/122d093a-1ede-43bd-bd34-59d2931ffc5e') |
98 | videoNameToExcept = 'E2E tests' | ||
99 | } else { | ||
100 | await videoWatchPage.clickOnVideo(videoName) | ||
101 | } | ||
98 | 102 | ||
99 | return videoWatchPage.waitWatchVideoName(videoNameToExcept, await isMobileDevice(), await isSafari()) | 103 | return videoWatchPage.waitWatchVideoName(videoNameToExcept, await isMobileDevice(), await isSafari()) |
100 | }) | 104 | }) |