2786: Upgrade appium and fix types

e2e-tests/native/test/helpers/Gestures.ts

@@ -3,18 +3,14 @@ const WAIT_FOR_SWIPE_FINISHED = 2000
 type SelectorReturn = ReturnType<typeof $>
 
 class Gestures {
-  static async checkIfDisplayedWithSwipeUp(selector: SelectorReturn, maxScrolls: number): Promise<WebdriverIO.Element> {
+  static async checkIfDisplayedWithSwipeUp(selector: SelectorReturn, maxScrolls: number): Promise<SelectorReturn> {
     if (driver.isAndroid) {
       return this.swipeIntoViewAndroid(selector, maxScrolls)
     }
     return this.swipeIntoViewIOS(selector, maxScrolls)
   }
 
-  static async swipeIntoViewAndroid(
-    selector: SelectorReturn,
-    maxScrolls: number,
-    amount = 0,
-  ): Promise<WebdriverIO.Element> {
+  static async swipeIntoViewAndroid(selector: SelectorReturn, maxScrolls: number, amount = 0): Promise<SelectorReturn> {
     const scrollForward = `android=new UiScrollable(new UiSelector().scrollable(true)).scrollForward()`
     if (!(await selector.isDisplayed()) && amount <= maxScrolls) {
       await $(scrollForward)
@@ -27,11 +23,7 @@ class Gestures {
     return selector
   }
 
-  static async swipeIntoViewIOS(
-    selector: SelectorReturn,
-    maxScrolls: number,
-    amount = 0,
-  ): Promise<WebdriverIO.Element> {
+  static async swipeIntoViewIOS(selector: SelectorReturn, maxScrolls: number, amount = 0): Promise<SelectorReturn> {
     // If the element is not displayed and we haven't scrolled the max amount of scrolls
     // then scroll and execute the method again
     if (!(await selector.isDisplayed()) && amount <= maxScrolls) {

e2e-tests/native/test/specs/navigateToOtherLocation.e2e.ts

@@ -14,7 +14,7 @@ describe('navigate to other location', () => {
     const cities = await LandingPage.cities
     const search = await LandingPage.search
 
-    expect(cities.length).toBeGreaterThan(0)
+    expect(await cities.length).toBeGreaterThan(0)
     await search.click()
     await search.addValue(filter)
 

e2e-tests/native/wdio-browserstack.conf.ts

@@ -49,6 +49,6 @@ export const config: WebdriverIO.Config = {
   before: async (): Promise<void> => {
     // implicit: time the driver will wait searching for elements ($, $$)
     const implicitTimeout = 2000
-    driver.setImplicitTimeout(implicitTimeout)
+    driver.setTimeouts(implicitTimeout)
   },
 }

e2e-tests/native/wdio-ios.conf.ts

@@ -1,8 +1,6 @@
-import { Capabilities } from '@wdio/types'
-
 import { config as defaultConfig } from './wdio.conf.js'
 
-const iosCapabilities: Capabilities.DesiredCapabilities = {
+const iosCapabilities: WebdriverIO.Capabilities = {
   platformName: 'iOS',
   // http://appium.io/docs/en/2.1/guides/caps/
   'appium:deviceName': 'iPhone 14',

e2e-tests/native/wdio.conf.ts

@@ -1,6 +1,4 @@
-import { Capabilities } from '@wdio/types'
-
-const androidCapabilities: Capabilities.DesiredCapabilities = {
+const androidCapabilities: WebdriverIO.Capabilities = {
   platformName: 'android',
   'appium:app': '../native/android/app/build/outputs/apk/debug/app-debug.apk',
   'appium:automationName': 'UiAutomator2',

e2e-tests/package.json

@@ -25,7 +25,7 @@
     "@wdio/local-runner": "^9.0.9",
     "@wdio/spec-reporter": "^9.0.8",
     "@wdio/types": "^9.0.8",
-    "appium": "^2.5.3",
+    "appium": "^2.11.3",
     "ts-node": "^10.9.2",
     "webdriverio": "^9.0.9"
   },

e2e-tests/web/capabilities.ts

@@ -2,7 +2,7 @@ import { Capabilities } from '@wdio/types'
 
 import { getGitBranch, getGitHeadReference } from '../shared/git.js'
 
-const browserstackCaps = (config: Capabilities.BrowserStackCapabilities): Capabilities.DesiredCapabilities => {
+const browserstackCaps = (config: Capabilities.BrowserStackCapabilities): WebdriverIO.Capabilities => {
   const prefix = process.env.CI ? 'IG CI' : 'IG DEV'
   return {
     'bstack:options': {
@@ -38,7 +38,7 @@ export const browserstackCapabilities = {
     browserName: 'Safari',
     browserVersion: '14.0',
   }),
-} as Record<(typeof browsers)[number], Capabilities.DesiredCapabilities>
+}
 
 export const ciCapabilities = {
   browserName: 'chrome',

e2e-tests/web/test/pageobjects/page.ts

@@ -10,10 +10,10 @@ export default class Page {
    */
 
   async open(path: string): Promise<string> {
-    const url = await browser.url(`${path}`)
-    if (url === undefined) {
+    const request = await browser.url(`${path}`)
+    if (request?.url === undefined) {
       throw new Error('Page not found')
     }
-    return url
+    return request.url
   }
 }

e2e-tests/web/wdio.conf.ts

@@ -1,9 +1,7 @@
-import { Capabilities } from '@wdio/types'
-
 import { browsers, ciCapabilities } from './capabilities.js'
 import waitForLocalhost from './waitForLocalhost.js'
 
-const getCapabilities = (): Array<Capabilities.DesiredCapabilities> => {
+const getCapabilities = (): Array<WebdriverIO.Capabilities> => {
   if (process.env.CI) {
     return [ciCapabilities]
   }

yarn.lock

@@ -6001,7 +6001,7 @@ appdirsjs@^1.2.4:
   resolved "https://registry.yarnpkg.com/appdirsjs/-/appdirsjs-1.2.7.tgz#50b4b7948a26ba6090d4aede2ae2dc2b051be3b3"
   integrity sha512-Quji6+8kLBC3NnBeo14nPDq0+2jUs5s3/xEye+udFHumHhRk4M7aAMXp/PBJqkKYGuuyR9M/6Dq7d2AViiGmhw==
 
-appium@^2.5.3:
+appium@^2.11.3:
   version "2.11.3"
   resolved "https://registry.yarnpkg.com/appium/-/appium-2.11.3.tgz#13770433b1a1564ec2c88232ea4c85203001482b"
   integrity sha512-O545jE/SkZecGBtT+yf7WTzkIyELkwgrKOIeXKTIiX5ob2Dzl+tVkTMzosJul8DaNsUlur7DR9PMAX9wZ7/o+A==