X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fe2e%2Fsrc%2Fpo%2Fvideo-watch.po.ts;h=fb9c3a000661e8628f42c3023c3a3a1043ff3378;hb=6b88559babc1e0490119a6b52411b10910d9da9d;hp=c5e37e6deeeb079ffba5138b6a5bc08a73932008;hpb=610d0be13b3d01f653ef269271dd667a57c85ef2;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/e2e/src/po/video-watch.po.ts b/client/e2e/src/po/video-watch.po.ts
index c5e37e6de..fb9c3a000 100644
--- a/client/e2e/src/po/video-watch.po.ts
+++ b/client/e2e/src/po/video-watch.po.ts
@@ -1,4 +1,5 @@
 import { browser, by, element, ElementFinder, ExpectedConditions } from 'protractor'
+import { browserSleep, isMobileDevice } from '../utils'
 
 export class VideoWatchPage {
   async goOnVideosList (isMobileDevice: boolean, isSafari: boolean) {
@@ -11,10 +12,10 @@ export class VideoWatchPage {
       url = '/videos/recently-added'
     }
 
-    await browser.get(url)
+    await browser.get(url, 20000)
 
     // Waiting the following element does not work on Safari...
-    if (isSafari) return browser.sleep(3000)
+    if (isSafari) return browserSleep(3000)
 
     const elem = element.all(by.css('.videos .video-miniature .video-miniature-name')).first()
     return browser.wait(browser.ExpectedConditions.visibilityOf(elem))
@@ -27,49 +28,33 @@ export class VideoWatchPage {
   }
 
   waitWatchVideoName (videoName: string, isMobileDevice: boolean, isSafari: boolean) {
+    if (isSafari) return browserSleep(5000)
+
     // On mobile we display the first node, on desktop the second
     const index = isMobileDevice ? 0 : 1
 
     const elem = element.all(by.css('.video-info .video-info-name')).get(index)
-
-    if (isSafari) return browser.sleep(5000)
-
     return browser.wait(browser.ExpectedConditions.textToBePresentInElement(elem, videoName))
   }
 
-  getWatchVideoPlayerCurrentTime () {
-    return element(by.css('.video-js .vjs-current-time-display'))
-      .getText()
-      .then((t: string) => t.split(':')[1])
-      .then(seconds => parseInt(seconds, 10))
-  }
-
   getVideoName () {
     return this.getVideoNameElement().getText()
   }
 
-  async playAndPauseVideo (isAutoplay: boolean, isMobileDevice: boolean) {
-    if (isAutoplay === false) {
-      const playButton = element(by.css('.vjs-big-play-button'))
-      await browser.wait(browser.ExpectedConditions.elementToBeClickable(playButton))
-      await playButton.click()
-    }
-
-    await browser.sleep(1000)
-    await browser.wait(browser.ExpectedConditions.invisibilityOf(element(by.css('.vjs-loading-spinner'))))
-
-    const videojsEl = element(by.css('div.video-js'))
-    await browser.wait(browser.ExpectedConditions.elementToBeClickable(videojsEl))
+  async goOnAssociatedEmbed () {
+    let url = await browser.getCurrentUrl()
+    url = url.replace('/watch/', '/embed/')
+    url = url.replace(':3333', ':9001')
 
-    // On Android, we need to click twice on "play" (BrowserStack particularity)
-    if (isMobileDevice) {
-      await browser.sleep(3000)
-      await videojsEl.click()
-    }
+    return browser.get(url)
+  }
 
-    await browser.sleep(7000)
+  async goOnP2PMediaLoaderEmbed () {
+    return browser.get('https://peertube2.cpy.re/videos/embed/969bf103-7818-43b5-94a0-de159e13de50')
+  }
 
-    return videojsEl.click()
+  async goOnP2PMediaLoaderPlaylistEmbed () {
+    return browser.get('https://peertube2.cpy.re/video-playlists/embed/73804a40-da9a-40c2-b1eb-2c6d9eec8f0a')
   }
 
   async clickOnVideo (videoName: string) {
@@ -97,18 +82,6 @@ export class VideoWatchPage {
     return textToReturn
   }
 
-  async goOnAssociatedEmbed () {
-    let url = await browser.getCurrentUrl()
-    url = url.replace('/watch/', '/embed/')
-    url = url.replace(':3333', ':9001')
-
-    return browser.get(url)
-  }
-
-  async goOnP2PMediaLoaderEmbed () {
-    return browser.get('https://peertube2.cpy.re/videos/embed/969bf103-7818-43b5-94a0-de159e13de50')
-  }
-
   async clickOnUpdate () {
     const dropdown = element(by.css('my-video-actions-dropdown .action-button'))
     await dropdown.click()