Support '/w/' and '/w/p/' for watch page

And use them as default in client

4 files changed, 6 insertions, 6 deletions

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
   }
 
diff --git a/client/e2e/src/videos.e2e-spec.ts b/client/e2e/src/videos.e2e-spec.ts
index bcc810297..fc816d1bf 100644
--- a/client/e2e/src/videos.e2e-spec.ts
+++ b/client/e2e/src/videos.e2e-spec.ts
@@ -85,7 +85,7 @@ describe('Videos workflow', () => {
     let videoNameToExcept = videoName
 
     if (await isMobileDevice() || await isSafari()) {
-      await browser.get('https://peertube2.cpy.re/videos/watch/122d093a-1ede-43bd-bd34-59d2931ffc5e')
+      await browser.get('https://peertube2.cpy.re/w/122d093a-1ede-43bd-bd34-59d2931ffc5e')
       videoNameToExcept = 'E2E tests'
     } else {
       await videoWatchPage.clickOnVideo(videoName)