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

[github/Chocobozzz/PeerTube.git] / client / e2e / src / po / my-account.ts

diff --git a/client/e2e/src/po/my-account.ts b/client/e2e/src/po/my-account.ts
index 6d0d8d61ecafb72c77efe069d39008e913233f6a..9866953e910bfc36900f8e85d3e29f1edd2fe67b 100644 (file)
--- a/client/e2e/src/po/my-account.ts
+++ b/client/e2e/src/po/my-account.ts
@@ -3,25 +3,32 @@ import { by, element, browser } from 'protractor'
 export class MyAccountPage {
 
   navigateToMyVideos () {
-    return element(by.css('a[href="/my-account/videos"]')).click()
+    return element(by.css('a[href="/my-library/videos"]')).click()
   }
 
   navigateToMyPlaylists () {
-    return element(by.css('a[href="/my-account/video-playlists"]')).click()
+    return element(by.css('a[href="/my-library/video-playlists"]')).click()
   }
 
   navigateToMyHistory () {
-    return element(by.css('a[href="/my-account/history/videos"]')).click()
+    return element(by.css('a[href="/my-library/history/videos"]')).click()
   }
 
   // My account Videos
 
-  removeVideo (name: string) {
-    return this.getVideoElement(name).element(by.css('my-delete-button')).click()
+  async removeVideo (name: string) {
+    const container = this.getVideoElement(name)
+
+    await container.element(by.css('.dropdown-toggle')).click()
+
+    const dropdownMenu = container.element(by.css('.dropdown-menu .dropdown-item:nth-child(2)'))
+    await browser.wait(browser.ExpectedConditions.presenceOf(dropdownMenu))
+
+    return dropdownMenu.click()
   }
 
   validRemove () {
-    return element(by.css('.action-button-submit')).click()
+    return element(by.css('input[type=submit]')).click()
   }
 
   countVideos (names: string[]) {
@@ -54,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)