From a1eda903a497857017495f37a1fd3593ba7ab23c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 28 May 2021 11:36:33 +0200 Subject: Support '/w/' and '/w/p/' for watch page And use them as default in client --- client/e2e/src/po/my-account.ts | 2 +- client/e2e/src/po/video-upload.po.ts | 2 +- client/e2e/src/po/video-watch.po.ts | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'client/e2e/src/po') diff --git a/client/e2e/src/po/my-account.ts b/client/e2e/src/po/my-account.ts index 61d42214d..9866953e9 100644 --- a/client/e2e/src/po/my-account.ts +++ b/client/e2e/src/po/my-account.ts @@ -61,7 +61,7 @@ export class MyAccountPage { async goOnAssociatedPlaylistEmbed () { let url = await browser.getCurrentUrl() - url = url.replace('/videos/watch/playlist/', '/video-playlists/embed/') + url = url.replace('/w/p/', '/video-playlists/embed/') url = url.replace(':3333', ':9001') return browser.get(url) diff --git a/client/e2e/src/po/video-upload.po.ts b/client/e2e/src/po/video-upload.po.ts index ad2acee7f..a248912ed 100644 --- a/client/e2e/src/po/video-upload.po.ts +++ b/client/e2e/src/po/video-upload.po.ts @@ -41,7 +41,7 @@ export class VideoUploadPage { await this.getSecondStepSubmitButton().click() - return browser.wait(browser.ExpectedConditions.urlContains('/watch/')) + return browser.wait(browser.ExpectedConditions.urlContains('/w/')) } private getSecondStepSubmitButton () { diff --git a/client/e2e/src/po/video-watch.po.ts b/client/e2e/src/po/video-watch.po.ts index b41fe0882..6d91d241e 100644 --- a/client/e2e/src/po/video-watch.po.ts +++ b/client/e2e/src/po/video-watch.po.ts @@ -43,7 +43,7 @@ export class VideoWatchPage { async goOnAssociatedEmbed () { let url = await browser.getCurrentUrl() - url = url.replace('/watch/', '/embed/') + url = url.replace('/w/', '/embed/') url = url.replace(':3333', ':9001') return browser.get(url) @@ -65,7 +65,7 @@ export class VideoWatchPage { await browser.wait(browser.ExpectedConditions.elementToBeClickable(video)) await video.click() - await browser.wait(browser.ExpectedConditions.urlContains('/watch/')) + await browser.wait(browser.ExpectedConditions.urlContains('/w/')) } async clickOnFirstVideo () { @@ -78,7 +78,7 @@ export class VideoWatchPage { const textToReturn = videoName.getText() await video.click() - await browser.wait(browser.ExpectedConditions.urlContains('/watch/')) + await browser.wait(browser.ExpectedConditions.urlContains('/w/')) return textToReturn } -- cgit v1.2.3