X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fe2e%2Fsrc%2Fpo%2Fvideo-watch.po.ts;h=65bf218370a27ec4a80f9d7a9e078a65eb785dce;hb=4e56f0fff12ab9840574e7a27277fc78b195b3e2;hp=c5e37e6deeeb079ffba5138b6a5bc08a73932008;hpb=3a1a00a4af866caa96355c6702bbf805685d0973;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..65bf21837 100644 --- a/client/e2e/src/po/video-watch.po.ts +++ b/client/e2e/src/po/video-watch.po.ts @@ -1,158 +1,137 @@ -import { browser, by, element, ElementFinder, ExpectedConditions } from 'protractor' +import { browserSleep, FIXTURE_URLS, go } from '../utils' export class VideoWatchPage { - async goOnVideosList (isMobileDevice: boolean, isSafari: boolean) { - let url: string - - // We did not upload a file on a mobile device - if (isMobileDevice === true || isSafari === true) { - url = 'https://peertube2.cpy.re/videos/local' - } else { - url = '/videos/recently-added' - } - - await browser.get(url) - // Waiting the following element does not work on Safari... - if (isSafari) return browser.sleep(3000) + constructor (private isMobileDevice: boolean, private isSafari: boolean) { - const elem = element.all(by.css('.videos .video-miniature .video-miniature-name')).first() - return browser.wait(browser.ExpectedConditions.visibilityOf(elem)) } - getVideosListName () { - return element.all(by.css('.videos .video-miniature .video-miniature-name')) - .getText() - .then((texts: any) => texts.map((t: any) => t.trim())) - } + waitWatchVideoName (videoName: string) { + if (this.isSafari) return browserSleep(5000) - waitWatchVideoName (videoName: string, isMobileDevice: boolean, isSafari: boolean) { // 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) + const index = this.isMobileDevice ? 0 : 1 - 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)) + return browser.waitUntil(async () => { + return (await $$('.video-info .video-info-name')[index].getText()).includes(videoName) + }) } getVideoName () { - return this.getVideoNameElement().getText() + return this.getVideoNameElement().then(e => e.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)) - - // On Android, we need to click twice on "play" (BrowserStack particularity) - if (isMobileDevice) { - await browser.sleep(3000) - await videojsEl.click() - } - - await browser.sleep(7000) - - return videojsEl.click() + getPrivacy () { + return $('.attribute-privacy .attribute-value').getText() } - async clickOnVideo (videoName: string) { - const video = element.all(by.css('.videos .video-miniature .video-miniature-name')) - .filter(e => e.getText().then(t => t === videoName )) - .first() - - await browser.wait(browser.ExpectedConditions.elementToBeClickable(video)) - await video.click() - - await browser.wait(browser.ExpectedConditions.urlContains('/watch/')) + getLicence () { + return $('.attribute-licence .attribute-value').getText() } - async clickOnFirstVideo () { - const video = element.all(by.css('.videos .video-miniature .video-thumbnail')).first() - const videoName = element.all(by.css('.videos .video-miniature .video-miniature-name')).first() + async isDownloadEnabled () { + await this.clickOnMoreDropdownIcon() - // Don't know why but the expectation fails on Safari - await browser.wait(browser.ExpectedConditions.elementToBeClickable(video)) + return $('.dropdown-item .icon-download').isExisting() + } - const textToReturn = videoName.getText() - await video.click() + areCommentsEnabled () { + return $('my-video-comment-add').isExisting() + } - await browser.wait(browser.ExpectedConditions.urlContains('/watch/')) - return textToReturn + isPrivacyWarningDisplayed () { + return $('my-privacy-concerns').isDisplayed() } async goOnAssociatedEmbed () { - let url = await browser.getCurrentUrl() - url = url.replace('/watch/', '/embed/') + let url = await browser.getUrl() + url = url.replace('/w/', '/videos/embed/') url = url.replace(':3333', ':9001') - return browser.get(url) + await go(url) + await $('.vjs-big-play-button').waitForDisplayed() } - async goOnP2PMediaLoaderEmbed () { - return browser.get('https://peertube2.cpy.re/videos/embed/969bf103-7818-43b5-94a0-de159e13de50') + isEmbedWarningDisplayed () { + return $('.peertube-dock-description').isDisplayed() + } + + goOnP2PMediaLoaderEmbed () { + return go(FIXTURE_URLS.HLS_EMBED) + } + + goOnP2PMediaLoaderPlaylistEmbed () { + return go(FIXTURE_URLS.HLS_PLAYLIST_EMBED) } async clickOnUpdate () { - const dropdown = element(by.css('my-video-actions-dropdown .action-button')) - await dropdown.click() + await this.clickOnMoreDropdownIcon() - const items: ElementFinder[] = await element.all(by.css('my-video-actions-dropdown .dropdown-menu .dropdown-item')) + const items = await $$('.dropdown-menu.show .dropdown-item') for (const item of items) { const href = await item.getAttribute('href') - if (href && href.includes('/update/')) { + if (href?.includes('/update/')) { await item.click() return } } } - async clickOnSave () { - return element(by.css('.action-button-save')).click() + clickOnSave () { + return $('.action-button-save').click() } async createPlaylist (name: string) { - await element(by.css('.new-playlist-button')).click() + const newPlaylistButton = () => $('.new-playlist-button') - await element(by.css('#displayName')).sendKeys(name) + await newPlaylistButton().waitForClickable() + await newPlaylistButton().click() - return element(by.css('.new-playlist-block input[type=submit]')).click() + const displayName = () => $('#displayName') + + await displayName().waitForDisplayed() + await displayName().setValue(name) + + return $('.new-playlist-block input[type=submit]').click() } async saveToPlaylist (name: string) { - return element.all(by.css('my-video-add-to-playlist .playlist')) - .filter(p => p.getText().then(t => t === name)) - .click() + const playlist = () => $('my-video-add-to-playlist').$(`.playlist=${name}`) + + await playlist().waitForDisplayed() + + return playlist().click() } waitUntilVideoName (name: string, maxTime: number) { - const elem = this.getVideoNameElement() + return browser.waitUntil(async () => { + return (await this.getVideoName()) === name + }, { timeout: maxTime }) + } + + async clickOnMoreDropdownIcon () { + const dropdown = $('my-video-actions-dropdown .action-button') + await dropdown.click() - return browser.wait(ExpectedConditions.textToBePresentInElement(elem, name), maxTime) + await $('.dropdown-menu.show .dropdown-item').waitForDisplayed() } - private getVideoNameElement () { + private async getVideoNameElement () { // We have 2 video info name block, pick the first that is not empty - return element.all(by.css('.video-info-first-row .video-info-name')) - .filter(e => e.getText().then(t => !!t)) - .first() + 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 elem() } }