aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/e2e/src/po
diff options
context:
space:
mode:
Diffstat (limited to 'client/e2e/src/po')
-rw-r--r--client/e2e/src/po/player.po.ts19
-rw-r--r--client/e2e/src/po/video-watch.po.ts9
2 files changed, 11 insertions, 17 deletions
diff --git a/client/e2e/src/po/player.po.ts b/client/e2e/src/po/player.po.ts
index 9d6e21009..372e8ab20 100644
--- a/client/e2e/src/po/player.po.ts
+++ b/client/e2e/src/po/player.po.ts
@@ -5,13 +5,12 @@ export class PlayerPage {
5 getWatchVideoPlayerCurrentTime () { 5 getWatchVideoPlayerCurrentTime () {
6 const elem = $('video') 6 const elem = $('video')
7 7
8 if (isIOS()) { 8 const p = isIOS()
9 return elem.getAttribute('currentTime') 9 ? elem.getAttribute('currentTime')
10 .then(t => parseInt(t, 10)) 10 : elem.getProperty('currentTime')
11 .then(t => Math.round(t))
12 }
13 11
14 return elem.getProperty('currentTime') 12 return p.then(t => parseInt(t + '', 10))
13 .then(t => Math.ceil(t))
15 } 14 }
16 15
17 waitUntilPlaylistInfo (text: string, maxTime: number) { 16 waitUntilPlaylistInfo (text: string, maxTime: number) {
@@ -26,7 +25,7 @@ export class PlayerPage {
26 }) 25 })
27 } 26 }
28 27
29 async playAndPauseVideo (isAutoplay: boolean) { 28 async playAndPauseVideo (isAutoplay: boolean, waitUntilSec: number) {
30 const videojsElem = () => $('div.video-js') 29 const videojsElem = () => $('div.video-js')
31 30
32 await videojsElem().waitForExist() 31 await videojsElem().waitForExist()
@@ -43,10 +42,8 @@ export class PlayerPage {
43 await browserSleep(2000) 42 await browserSleep(2000)
44 43
45 await browser.waitUntil(async () => { 44 await browser.waitUntil(async () => {
46 return !await $('.vjs-loading-spinner').isDisplayedInViewport() 45 return (await this.getWatchVideoPlayerCurrentTime()) >= 2
47 }, { timeout: 20 * 1000 }) 46 })
48
49 await browserSleep(4000)
50 47
51 await videojsElem().click() 48 await videojsElem().click()
52 } 49 }
diff --git a/client/e2e/src/po/video-watch.po.ts b/client/e2e/src/po/video-watch.po.ts
index 01061d5d4..c07f4b25f 100644
--- a/client/e2e/src/po/video-watch.po.ts
+++ b/client/e2e/src/po/video-watch.po.ts
@@ -1,3 +1,4 @@
1import { FIXTURE_URLS } from '../urls'
1import { browserSleep, go } from '../utils' 2import { browserSleep, go } from '../utils'
2 3
3export class VideoWatchPage { 4export class VideoWatchPage {
@@ -50,15 +51,11 @@ export class VideoWatchPage {
50 } 51 }
51 52
52 goOnP2PMediaLoaderEmbed () { 53 goOnP2PMediaLoaderEmbed () {
53 return go( 54 return go(FIXTURE_URLS.HLS_EMBED)
54 'https://peertube2.cpy.re/videos/embed/969bf103-7818-43b5-94a0-de159e13de50'
55 )
56 } 55 }
57 56
58 goOnP2PMediaLoaderPlaylistEmbed () { 57 goOnP2PMediaLoaderPlaylistEmbed () {
59 return go( 58 return go(FIXTURE_URLS.HLS_PLAYLIST_EMBED)
60 'https://peertube2.cpy.re/video-playlists/embed/73804a40-da9a-40c2-b1eb-2c6d9eec8f0a'
61 )
62 } 59 }
63 60
64 async clickOnVideo (videoName: string) { 61 async clickOnVideo (videoName: string) {