2 files changed, 11 insertions, 4 deletions

diff --git a/client/e2e/src/po/video-watch.po.ts b/client/e2e/src/po/video-watch.po.ts
index c06b131b6..c5e37e6de 100644
--- a/client/e2e/src/po/video-watch.po.ts
+++ b/client/e2e/src/po/video-watch.po.ts
@@ -14,7 +14,7 @@ export class VideoWatchPage {
     await browser.get(url)
 
     // Waiting the following element does not work on Safari...
-    if (isSafari === true) return browser.sleep(3000)
+    if (isSafari) return browser.sleep(3000)
 
     const elem = element.all(by.css('.videos .video-miniature .video-miniature-name')).first()
     return browser.wait(browser.ExpectedConditions.visibilityOf(elem))
@@ -73,7 +73,10 @@ export class VideoWatchPage {
   }
 
   async clickOnVideo (videoName: string) {
-    const video = element(by.css('.videos .video-miniature .video-thumbnail[title="' + videoName + '"]'))
+    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()
 
@@ -103,7 +106,7 @@ export class VideoWatchPage {
   }
 
   async goOnP2PMediaLoaderEmbed () {
-    return browser.get('https://peertube2.cpy.re/videos/embed/969bf103-7818-43b5-94a0-de159e13de50?mode=p2p-media-loader')
+    return browser.get('https://peertube2.cpy.re/videos/embed/969bf103-7818-43b5-94a0-de159e13de50')
   }
 
   async clickOnUpdate () {
@@ -148,7 +151,7 @@ export class VideoWatchPage {
 
   private getVideoNameElement () {
     // We have 2 video info name block, pick the first that is not empty
-    return element.all(by.css('.video-bottom .video-info-name'))
+    return element.all(by.css('.video-info-first-row .video-info-name'))
                   .filter(e => e.getText().then(t => !!t))
                   .first()
   }
diff --git a/client/e2e/src/videos.e2e-spec.ts b/client/e2e/src/videos.e2e-spec.ts
index 075add531..b2c5ab4c6 100644
--- a/client/e2e/src/videos.e2e-spec.ts
+++ b/client/e2e/src/videos.e2e-spec.ts
@@ -53,6 +53,10 @@ describe('Videos workflow', () => {
     if (await isSafari()) {
       console.log('Safari detected.')
     }
+
+    if (!await isMobileDevice()) {
+      await browser.driver.manage().window().maximize()
+    }
   })
 
   it('Should log in', async () => {