3 files changed, 33 insertions, 15 deletions

diff --git a/client/e2e/src/po/login.po.ts b/client/e2e/src/po/login.po.ts
index e2362ef51..a8606dbd2 100644
--- a/client/e2e/src/po/login.po.ts
+++ b/client/e2e/src/po/login.po.ts
@@ -1,4 +1,4 @@
-import { go } from '../utils'
+import { browserSleep, go, isAndroid, isMobileDevice } from '../utils'
 
 export class LoginPage {
 
@@ -23,9 +23,17 @@ export class LoginPage {
     await $('input#username').setValue(username)
     await $('input#password').setValue(password)
 
-    await browser.pause(1000)
+    await browserSleep(1000)
 
-    await $('form input[type=submit]').click()
+    const submit = $('.login-form-and-externals > form input[type=submit]')
+    await submit.click()
+
+    // Have to do this on Android, don't really know why
+    // I think we need to "escape" from the password input, so click twice on the submit button
+    if (isAndroid()) {
+      await browserSleep(2000)
+      await submit.click()
+    }
 
     if (this.isMobileDevice) {
       const menuToggle = $('.top-left-block span[role=button]')
diff --git a/client/e2e/src/po/player.po.ts b/client/e2e/src/po/player.po.ts
index 33719da25..e41422359 100644
--- a/client/e2e/src/po/player.po.ts
+++ b/client/e2e/src/po/player.po.ts
@@ -29,29 +29,32 @@ export class PlayerPage {
   }
 
   async playAndPauseVideo (isAutoplay: boolean, waitUntilSec: number) {
-    const videojsElem = () => $('div.video-js')
-
-    await videojsElem().waitForExist()
-
-    // Autoplay is disabled on iOS and Safari
-    if (isIOS() || isSafari() || isMobileDevice()) {
-      // We can't play the video if it is not muted
-      await browser.execute(`document.querySelector('video').muted = true`)
-      await this.clickOnPlayButton()
-    } else if (isAutoplay === false) {
-      await this.clickOnPlayButton()
+    // Autoplay is disabled on mobile and Safari
+    if (isIOS() || isSafari() || isMobileDevice() || isAutoplay === false) {
+      await this.playVideo()
     }
 
+    await $('div.video-js.vjs-has-started').waitForExist()
+
     await browserSleep(2000)
 
     await browser.waitUntil(async () => {
       return (await this.getWatchVideoPlayerCurrentTime()) >= waitUntilSec
     })
 
-    await videojsElem().click()
+    // Pause video
+    await $('div.video-js').click()
   }
 
   async playVideo () {
+    await $('div.video-js.vjs-paused').waitForExist()
+
+    // Autoplay is disabled on iOS and Safari
+    if (isIOS() || isSafari() || isMobileDevice()) {
+      // We can't play the video if it is not muted
+      await browser.execute(`document.querySelector('video').muted = true`)
+    }
+
     return this.clickOnPlayButton()
   }
 
diff --git a/client/e2e/src/utils/common.ts b/client/e2e/src/utils/common.ts
index eb5f6b450..b04fe47f3 100644
--- a/client/e2e/src/utils/common.ts
+++ b/client/e2e/src/utils/common.ts
@@ -8,6 +8,12 @@ function isMobileDevice () {
   return platformName === 'android' || platformName === 'ios'
 }
 
+function isAndroid () {
+  const platformName = (browser.capabilities['platformName'] || '').toLowerCase()
+
+  return platformName === 'android'
+}
+
 function isSafari () {
   return browser.capabilities['browserName'] &&
          browser.capabilities['browserName'].toLowerCase() === 'safari'
@@ -41,6 +47,7 @@ export {
   isMobileDevice,
   isSafari,
   isIOS,
+  isAndroid,
   waitServerUp,
   go,
   browserSleep