X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fe2e%2Fsrc%2Fpo%2Fvideo-watch.po.ts;h=65bf218370a27ec4a80f9d7a9e078a65eb785dce;hb=4e56f0fff12ab9840574e7a27277fc78b195b3e2;hp=19d02ff51b422f16f7331e2bf41f85d46b88e402;hpb=d1bd87e066633b8a66266b280327ec828980916b;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 19d02ff51..65bf21837 100644
--- a/client/e2e/src/po/video-watch.po.ts
+++ b/client/e2e/src/po/video-watch.po.ts
@@ -1,90 +1,137 @@
-import { by, element, browser } from 'protractor'
+import { browserSleep, FIXTURE_URLS, go } from '../utils'
 
 export class VideoWatchPage {
-  async goOnVideosList (isIphoneDevice: boolean, isSafari: boolean) {
-    let url: string
-
-    if (isIphoneDevice === true) {
-      // Local testing is buggy :/
-      url = 'https://peertube2.cpy.re/videos/local'
-    } else {
-      url = '/videos/recently-added'
-    }
 
-    await browser.get(url)
+  constructor (private isMobileDevice: boolean, private isSafari: boolean) {
+
+  }
+
+  waitWatchVideoName (videoName: string) {
+    if (this.isSafari) return browserSleep(5000)
+
+    // On mobile we display the first node, on desktop the second
+    const index = this.isMobileDevice ? 0 : 1
 
-    // Waiting the following element does not work on Safari...
-    if (isSafari === true) return browser.sleep(3000)
+    return browser.waitUntil(async () => {
+      return (await $$('.video-info .video-info-name')[index].getText()).includes(videoName)
+    })
+  }
 
-    const elem = element.all(by.css('.videos .video-miniature .video-miniature-name')).first()
-    return browser.wait(browser.ExpectedConditions.visibilityOf(elem))
+  getVideoName () {
+    return this.getVideoNameElement().then(e => e.getText())
   }
 
-  getVideosListName () {
-    return element.all(by.css('.videos .video-miniature .video-miniature-name'))
-                  .getText()
-                  .then((texts: any) => texts.map(t => t.trim()))
+  getPrivacy () {
+    return $('.attribute-privacy .attribute-value').getText()
   }
 
-  waitWatchVideoName (videoName: string) {
-    const elem = element(by.css('.video-info .video-info-name'))
-    return browser.wait(browser.ExpectedConditions.textToBePresentInElement(elem, videoName))
+  getLicence () {
+    return $('.attribute-licence .attribute-value').getText()
   }
 
-  getWatchVideoPlayerCurrentTime () {
-    return element(by.css('.video-js .vjs-current-time-display'))
-      .getText()
-      .then((t: string) => t.split(':')[1])
-      .then(seconds => parseInt(seconds, 10))
+  async isDownloadEnabled () {
+    await this.clickOnMoreDropdownIcon()
+
+    return $('.dropdown-item .icon-download').isExisting()
   }
 
-  async pauseVideo (pauseAfterMs: number, isAutoplay: boolean, isSafari: boolean) {
-    if (isAutoplay === false) {
-      const playButton = element(by.css('.vjs-big-play-button'))
-      await browser.wait(browser.ExpectedConditions.elementToBeClickable(playButton))
-      await playButton.click()
-    }
+  areCommentsEnabled () {
+    return $('my-video-comment-add').isExisting()
+  }
+
+  isPrivacyWarningDisplayed () {
+    return $('my-privacy-concerns').isDisplayed()
+  }
+
+  async goOnAssociatedEmbed () {
+    let url = await browser.getUrl()
+    url = url.replace('/w/', '/videos/embed/')
+    url = url.replace(':3333', ':9001')
+
+    await go(url)
+    await $('.vjs-big-play-button').waitForDisplayed()
+  }
+
+  isEmbedWarningDisplayed () {
+    return $('.peertube-dock-description').isDisplayed()
+  }
 
-    if (isSafari === true) {
-      await browser.sleep(1000)
-      await element(by.css('.vjs-play-control')).click()
+  goOnP2PMediaLoaderEmbed () {
+    return go(FIXTURE_URLS.HLS_EMBED)
+  }
+
+  goOnP2PMediaLoaderPlaylistEmbed () {
+    return go(FIXTURE_URLS.HLS_PLAYLIST_EMBED)
+  }
+
+  async clickOnUpdate () {
+    await this.clickOnMoreDropdownIcon()
+
+    const items = await $$('.dropdown-menu.show .dropdown-item')
+
+    for (const item of items) {
+      const href = await item.getAttribute('href')
+
+      if (href?.includes('/update/')) {
+        await item.click()
+        return
+      }
     }
+  }
+
+  clickOnSave () {
+    return $('.action-button-save').click()
+  }
 
-    await browser.sleep(1000)
-    await browser.wait(browser.ExpectedConditions.invisibilityOf(element(by.css('.vjs-loading-spinner'))))
+  async createPlaylist (name: string) {
+    const newPlaylistButton = () => $('.new-playlist-button')
 
-    const el = element(by.css('div.video-js'))
-    await browser.wait(browser.ExpectedConditions.elementToBeClickable(el))
+    await newPlaylistButton().waitForClickable()
+    await newPlaylistButton().click()
 
-    await browser.sleep(pauseAfterMs)
+    const displayName = () => $('#displayName')
 
-    return el.click()
+    await displayName().waitForDisplayed()
+    await displayName().setValue(name)
+
+    return $('.new-playlist-block input[type=submit]').click()
   }
 
-  async clickOnVideo (videoName: string) {
-    const video = element(by.css('.videos .video-miniature .video-thumbnail[title="' + videoName + '"]'))
-    await browser.wait(browser.ExpectedConditions.elementToBeClickable(video))
-    await video.click()
+  async saveToPlaylist (name: string) {
+    const playlist = () => $('my-video-add-to-playlist').$(`.playlist=${name}`)
+
+    await playlist().waitForDisplayed()
 
-    await browser.wait(browser.ExpectedConditions.urlContains('/watch/'))
+    return playlist().click()
   }
 
-  async clickOnFirstVideo () {
-    const video = element.all(by.css('.videos .video-miniature .video-miniature-name')).first()
-    await browser.wait(browser.ExpectedConditions.elementToBeClickable(video))
-    const textToReturn = video.getText()
+  waitUntilVideoName (name: string, maxTime: number) {
+    return browser.waitUntil(async () => {
+      return (await this.getVideoName()) === name
+    }, { timeout: maxTime })
+  }
 
-    await video.click()
+  async clickOnMoreDropdownIcon () {
+    const dropdown = $('my-video-actions-dropdown .action-button')
+    await dropdown.click()
 
-    await browser.wait(browser.ExpectedConditions.urlContains('/watch/'))
-    return textToReturn
+    await $('.dropdown-menu.show .dropdown-item').waitForDisplayed()
   }
 
-  async goOnAssociatedEmbed () {
-    let url = await browser.getCurrentUrl()
-    url = url.replace('/watch/', '/embed/')
-    url = url.replace(':3333', ':9001')
+  private async getVideoNameElement () {
+    // We have 2 video info name block, pick the first that is not empty
+    const elem = async () => {
+      const elems = await $$('.video-info-first-row .video-info-name').filter(e => e.isDisplayed())
+
+      return elems[0]
+    }
+
+    await browser.waitUntil(async () => {
+      const e = await elem()
+
+      return e?.isDisplayed()
+    })
 
-    return browser.get(url)
+    return elem()
   }
 }