Improve E2E tests

Add tests for private video static endpoints
Fix tests for local firefox

2 files changed, 63 insertions, 3 deletions

diff --git a/client/e2e/src/suites-all/private-videos.e2e-spec.ts b/client/e2e/src/suites-all/private-videos.e2e-spec.ts
new file mode 100644
index 000000000..db3554659
--- /dev/null
+++ b/client/e2e/src/suites-all/private-videos.e2e-spec.ts
@@ -0,0 +1,60 @@
+import { LoginPage } from '../po/login.po'
+import { PlayerPage } from '../po/player.po'
+import { VideoWatchPage } from '../po/video-watch.po'
+import { FIXTURE_URLS, go, isMobileDevice, isSafari } from '../utils'
+
+async function checkCorrectlyPlay (playerPage: PlayerPage) {
+  await playerPage.playAndPauseVideo(false, 2)
+
+  expect(await playerPage.getWatchVideoPlayerCurrentTime()).toBeGreaterThanOrEqual(2)
+}
+
+describe('Private videos all workflow', () => {
+  let videoWatchPage: VideoWatchPage
+  let loginPage: LoginPage
+  let playerPage: PlayerPage
+
+  const internalVideoName = 'Internal E2E test'
+
+  beforeEach(async () => {
+    videoWatchPage = new VideoWatchPage(isMobileDevice(), isSafari())
+    loginPage = new LoginPage(isMobileDevice())
+    playerPage = new PlayerPage()
+
+    if (!isMobileDevice()) {
+      await browser.maximizeWindow()
+    }
+  })
+
+  it('Should log in', async () => {
+    return loginPage.loginOnPeerTube2()
+  })
+
+  it('Should play an internal webtorrent video', async () => {
+    await go(FIXTURE_URLS.INTERNAL_WEBTORRENT_VIDEO)
+
+    await videoWatchPage.waitWatchVideoName(internalVideoName)
+    await checkCorrectlyPlay(playerPage)
+  })
+
+  it('Should play an internal HLS video', async () => {
+    await go(FIXTURE_URLS.INTERNAL_HLS_VIDEO)
+
+    await videoWatchPage.waitWatchVideoName(internalVideoName)
+    await checkCorrectlyPlay(playerPage)
+  })
+
+  it('Should play an internal WebTorrent video in embed', async () => {
+    await go(FIXTURE_URLS.INTERNAL_EMBED_WEBTORRENT_VIDEO)
+
+    await videoWatchPage.waitEmbedForDisplayed()
+    await checkCorrectlyPlay(playerPage)
+  })
+
+  it('Should play an internal HLS video in embed', async () => {
+    await go(FIXTURE_URLS.INTERNAL_EMBED_HLS_VIDEO)
+
+    await videoWatchPage.waitEmbedForDisplayed()
+    await checkCorrectlyPlay(playerPage)
+  })
+})
diff --git a/client/e2e/src/suites-all/videos.e2e-spec.ts b/client/e2e/src/suites-all/videos.e2e-spec.ts
index b3a87c8e2..997d58884 100644
--- a/client/e2e/src/suites-all/videos.e2e-spec.ts
+++ b/client/e2e/src/suites-all/videos.e2e-spec.ts
@@ -49,7 +49,7 @@ describe('Videos all workflow', () => {
     videoUploadPage = new VideoUploadPage()
     videoUpdatePage = new VideoUpdatePage()
     myAccountPage = new MyAccountPage()
-    loginPage = new LoginPage()
+    loginPage = new LoginPage(isMobileDevice())
     playerPage = new PlayerPage()
     videoListPage = new VideoListPage(isMobileDevice(), isSafari())
 
@@ -72,7 +72,7 @@ describe('Videos all workflow', () => {
 
     await videoUploadPage.navigateTo()
 
-    await videoUploadPage.uploadVideo()
+    await videoUploadPage.uploadVideo('video.mp4')
     return videoUploadPage.validSecondUploadStep(videoName)
   })
 
@@ -147,7 +147,7 @@ describe('Videos all workflow', () => {
 
     await videoUploadPage.navigateTo()
 
-    await videoUploadPage.uploadVideo()
+    await videoUploadPage.uploadVideo('video2.mp4')
     await videoUploadPage.validSecondUploadStep(video2Name)
 
     await videoWatchPage.clickOnSave()