5 files changed, 18 insertions, 14 deletions

diff --git a/client/e2e/src/suites-local/custom-server-defaults.e2e-spec.ts b/client/e2e/src/suites-local/custom-server-defaults.e2e-spec.ts
index e060d382f..71840d707 100644
--- a/client/e2e/src/suites-local/custom-server-defaults.e2e-spec.ts
+++ b/client/e2e/src/suites-local/custom-server-defaults.e2e-spec.ts
@@ -11,7 +11,7 @@ describe('Custom server defaults', () => {
   before(async () => {
     await waitServerUp()
 
-    loginPage = new LoginPage()
+    loginPage = new LoginPage(isMobileDevice())
     videoUploadPage = new VideoUploadPage()
     videoWatchPage = new VideoWatchPage(isMobileDevice(), isSafari())
 
@@ -25,7 +25,7 @@ describe('Custom server defaults', () => {
 
     it('Should upload a video with custom default values', async function () {
       await videoUploadPage.navigateTo()
-      await videoUploadPage.uploadVideo()
+      await videoUploadPage.uploadVideo('video.mp4')
       await videoUploadPage.validSecondUploadStep('video')
 
       await videoWatchPage.waitWatchVideoName('video')
@@ -60,7 +60,7 @@ describe('Custom server defaults', () => {
     before(async () => {
       await loginPage.loginAsRootUser()
       await videoUploadPage.navigateTo()
-      await videoUploadPage.uploadVideo()
+      await videoUploadPage.uploadVideo('video2.mp4')
       await videoUploadPage.setAsPublic()
       await videoUploadPage.validSecondUploadStep('video')
 
diff --git a/client/e2e/src/suites-local/plugins.e2e-spec.ts b/client/e2e/src/suites-local/plugins.e2e-spec.ts
index a32ba1044..363c7f836 100644
--- a/client/e2e/src/suites-local/plugins.e2e-spec.ts
+++ b/client/e2e/src/suites-local/plugins.e2e-spec.ts
@@ -1,7 +1,7 @@
 import { AdminPluginPage } from '../po/admin-plugin.po'
 import { LoginPage } from '../po/login.po'
 import { VideoUploadPage } from '../po/video-upload.po'
-import { getCheckbox, waitServerUp } from '../utils'
+import { getCheckbox, isMobileDevice, waitServerUp } from '../utils'
 
 describe('Plugins', () => {
   let videoUploadPage: VideoUploadPage
@@ -24,7 +24,7 @@ describe('Plugins', () => {
   })
 
   beforeEach(async () => {
-    loginPage = new LoginPage()
+    loginPage = new LoginPage(isMobileDevice())
     videoUploadPage = new VideoUploadPage()
     adminPluginPage = new AdminPluginPage()
 
@@ -42,7 +42,7 @@ describe('Plugins', () => {
 
   it('Should have checkbox in video edit page', async () => {
     await videoUploadPage.navigateTo()
-    await videoUploadPage.uploadVideo()
+    await videoUploadPage.uploadVideo('video.mp4')
 
     await $('span=Super field 4 in main tab').waitForDisplayed()
 
@@ -54,6 +54,8 @@ describe('Plugins', () => {
 
   it('Should check the checkbox and be able to submit the video', async function () {
     const checkbox = await getPluginCheckbox()
+
+    await checkbox.waitForClickable()
     await checkbox.click()
 
     await expectSubmitState({ disabled: false })
@@ -61,6 +63,8 @@ describe('Plugins', () => {
 
   it('Should uncheck the checkbox and not be able to submit the video', async function () {
     const checkbox = await getPluginCheckbox()
+
+    await checkbox.waitForClickable()
     await checkbox.click()
 
     await expectSubmitState({ disabled: true })
diff --git a/client/e2e/src/suites-local/signup.e2e-spec.ts b/client/e2e/src/suites-local/signup.e2e-spec.ts
index 0f6d7a0e6..4eed3eefe 100644
--- a/client/e2e/src/suites-local/signup.e2e-spec.ts
+++ b/client/e2e/src/suites-local/signup.e2e-spec.ts
@@ -1,7 +1,7 @@
 import { AdminConfigPage } from '../po/admin-config.po'
 import { LoginPage } from '../po/login.po'
 import { SignupPage } from '../po/signup.po'
-import { waitServerUp } from '../utils'
+import { isMobileDevice, waitServerUp } from '../utils'
 
 describe('Signup', () => {
   let loginPage: LoginPage
@@ -13,7 +13,7 @@ describe('Signup', () => {
   })
 
   beforeEach(async () => {
-    loginPage = new LoginPage()
+    loginPage = new LoginPage(isMobileDevice())
     adminConfigPage = new AdminConfigPage()
     signupPage = new SignupPage()
 
diff --git a/client/e2e/src/suites-local/user-settings.e2e-spec.ts b/client/e2e/src/suites-local/user-settings.e2e-spec.ts
index b87501cd1..3e982d26f 100644
--- a/client/e2e/src/suites-local/user-settings.e2e-spec.ts
+++ b/client/e2e/src/suites-local/user-settings.e2e-spec.ts
@@ -15,7 +15,7 @@ describe('User settings', () => {
   before(async () => {
     await waitServerUp()
 
-    loginPage = new LoginPage()
+    loginPage = new LoginPage(isMobileDevice())
     videoUploadPage = new VideoUploadPage()
     videoWatchPage = new VideoWatchPage(isMobileDevice(), isSafari())
     myAccountPage = new MyAccountPage()
@@ -43,7 +43,7 @@ describe('User settings', () => {
     before(async () => {
       await loginPage.loginAsRootUser()
       await videoUploadPage.navigateTo()
-      await videoUploadPage.uploadVideo()
+      await videoUploadPage.uploadVideo('video.mp4')
       await videoUploadPage.validSecondUploadStep('video')
 
       await videoWatchPage.waitWatchVideoName('video')
diff --git a/client/e2e/src/suites-local/videos-list.e2e-spec.ts b/client/e2e/src/suites-local/videos-list.e2e-spec.ts
index ce57261b9..8264308f2 100644
--- a/client/e2e/src/suites-local/videos-list.e2e-spec.ts
+++ b/client/e2e/src/suites-local/videos-list.e2e-spec.ts
@@ -106,7 +106,7 @@ describe('Videos list', () => {
   beforeEach(async () => {
     videoListPage = new VideoListPage(isMobileDevice(), isSafari())
     adminConfigPage = new AdminConfigPage()
-    loginPage = new LoginPage()
+    loginPage = new LoginPage(isMobileDevice())
     videoUploadPage = new VideoUploadPage()
     myAccountPage = new MyAccountPage()
     videoSearchPage = new VideoSearchPage()
@@ -128,12 +128,12 @@ describe('Videos list', () => {
 
   it('Should upload 2 videos (NSFW and classic videos)', async () => {
     await videoUploadPage.navigateTo()
-    await videoUploadPage.uploadVideo()
+    await videoUploadPage.uploadVideo('video.mp4')
     await videoUploadPage.setAsNSFW()
     await videoUploadPage.validSecondUploadStep(nsfwVideo)
 
     await videoUploadPage.navigateTo()
-    await videoUploadPage.uploadVideo()
+    await videoUploadPage.uploadVideo('video2.mp4')
     await videoUploadPage.validSecondUploadStep(normalVideo)
   })
 
@@ -205,7 +205,7 @@ describe('Videos list', () => {
     it('Should have default video values', async function () {
       await loginPage.loginAsRootUser()
       await videoUploadPage.navigateTo()
-      await videoUploadPage.uploadVideo()
+      await videoUploadPage.uploadVideo('video3.mp4')
       await videoUploadPage.validSecondUploadStep('video')
 
       await videoWatchPage.waitWatchVideoName('video')