X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fe2e%2Fsrc%2Futils.ts;h=df1c29238d040681d7d67586211354367a89df4a;hb=3419e0e1fe8e48a08b63ca0ded31087f913eb2b6;hp=a9d30c03acdc7ff8632aa7aa9bf7e6a553617b1a;hpb=2a4c9669d2d6ac6cd4ae43544698f826ae98080f;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/e2e/src/utils.ts b/client/e2e/src/utils.ts
index a9d30c03a..df1c29238 100644
--- a/client/e2e/src/utils.ts
+++ b/client/e2e/src/utils.ts
@@ -1,34 +1,37 @@
-import { browser } from 'protractor'
-
 async function browserSleep (amount: number) {
-  const oldValue = await browser.waitForAngularEnabled()
-
-  // iOS does not seem to work with protractor
-  // https://github.com/angular/protractor/issues/2840
-  if (await isIOS()) browser.waitForAngularEnabled(true)
+  await browser.pause(amount)
+}
 
-  await browser.sleep(amount)
+function isMobileDevice () {
+  const platformName = (browser.capabilities['platformName'] || '').toLowerCase()
 
-  if (await isIOS()) browser.waitForAngularEnabled(oldValue)
+  return platformName === 'android' || platformName === 'ios'
 }
 
-async function isMobileDevice () {
-  const caps = await browser.getCapabilities()
-  return caps.get('realMobile') === 'true' || caps.get('realMobile') === true
+function isSafari () {
+  return browser.capabilities['browserName'] &&
+         browser.capabilities['browserName'].toLowerCase() === 'safari'
 }
 
-async function isSafari () {
-  const caps = await browser.getCapabilities()
-  return caps.get('browserName') && caps.get('browserName').toLowerCase() === 'safari'
+function isIOS () {
+  return isMobileDevice() && isSafari()
 }
 
-async function isIOS () {
-  return await isMobileDevice() && await isSafari()
+async function go (url: string) {
+  await browser.url(url)
+
+  // Hide notifications that could fail tests when hiding buttons
+  await browser.execute(() => {
+    const style = document.createElement('style')
+    style.innerHTML = 'p-toast { display: none }'
+    document.head.appendChild(style)
+  })
 }
 
-export  {
+export {
   isMobileDevice,
   isSafari,
   isIOS,
+  go,
   browserSleep
 }