2786: Upgrade

.circleci/config.yml

@@ -252,7 +252,7 @@ commands:
 jobs:
     build_android:
         docker:
-            - image: cimg/android:2024.04.1-node
+            - image: cimg/android:2024.08.1-node
         environment:
             FASTLANE_SKIP_UPDATE_CHECK: true
             TOTAL_CPUS: 4
@@ -415,7 +415,7 @@ jobs:
             - notify
     build_web:
         docker:
-            - image: cimg/node:20.12.1
+            - image: cimg/node:20.17.0
         environment:
             TOTAL_CPUS: 2
         parameters:
@@ -460,7 +460,7 @@ jobs:
             - notify
     bump_version:
         docker:
-            - image: cimg/node:20.12.1
+            - image: cimg/node:20.17.0
         parameters:
             prepare_delivery:
                 default: false
@@ -502,7 +502,7 @@ jobs:
             - notify
     check:
         docker:
-            - image: cimg/node:20.12.1
+            - image: cimg/node:20.17.0
         environment:
             TOTAL_CPUS: 1
             TZ: Europe/Berlin
@@ -535,7 +535,7 @@ jobs:
             - notify
     deliver_android:
         docker:
-            - image: cimg/android:2024.04.1-node
+            - image: cimg/android:2024.08.1-node
         environment:
             FASTLANE_SKIP_UPDATE_CHECK: true
         parameters:
@@ -624,7 +624,7 @@ jobs:
             - notify
     deliver_web:
         docker:
-            - image: cimg/node:20.12.1
+            - image: cimg/node:20.17.0
         parameters:
             delivery:
                 description: Whether to deliver to production, beta or to webnext.
@@ -703,7 +703,7 @@ jobs:
             - notify
     e2e_android:
         docker:
-            - image: cimg/android:2024.04.1-node
+            - image: cimg/android:2024.08.1-node
         environment:
             FASTLANE_SKIP_UPDATE_CHECK: true
         resource_class: small
@@ -722,7 +722,7 @@ jobs:
             - notify
     e2e_ios:
         docker:
-            - image: cimg/android:2024.04.1-node
+            - image: cimg/android:2024.08.1-node
         environment:
             FASTLANE_SKIP_UPDATE_CHECK: true
         resource_class: small
@@ -741,7 +741,7 @@ jobs:
             - notify
     e2e_web:
         docker:
-            - image: cimg/node:20.12.1-browsers
+            - image: cimg/node:20.17.0-browsers
             - image: selenium/standalone-chrome
         resource_class: medium
         shell: /bin/bash -eo pipefail
@@ -760,7 +760,7 @@ jobs:
             - notify
     move_release_notes:
         docker:
-            - image: cimg/node:20.12.1
+            - image: cimg/node:20.17.0
         resource_class: small
         steps:
             - checkout
@@ -775,7 +775,7 @@ jobs:
             - notify
     notify_android:
         docker:
-            - image: cimg/node:20.12.1
+            - image: cimg/node:20.17.0
         parameters:
             production_delivery:
                 description: Whether builds are delivered to the production or beta lane of the play store.
@@ -808,7 +808,7 @@ jobs:
                 success_message: <<^ parameters.production_delivery >>[Beta] <</ parameters.production_delivery >>Integreat, Malte and Aschaffenburg ${NEW_VERSION_NAME} have been released successfully on Android!\n${RELEASE_NOTES}\n${ANDROID_ARTIFACT_URLS}
     notify_ios:
         docker:
-            - image: cimg/node:20.12.1
+            - image: cimg/node:20.17.0
         parameters:
             production_delivery:
                 description: Whether builds are delivered to the app store or testflight.
@@ -841,7 +841,7 @@ jobs:
                 success_message: <<^ parameters.production_delivery >>[Beta] <</ parameters.production_delivery >>Integreat, Malte and Aschaffenburg ${NEW_VERSION_NAME} have been released successfully on iOS!\n${RELEASE_NOTES}\n${IOS_ARTIFACT_URLS}
     notify_web:
         docker:
-            - image: cimg/node:20.12.1
+            - image: cimg/node:20.17.0
         parameters:
             production_delivery:
                 description: Whether builds are delivered to production or beta.
@@ -877,7 +877,7 @@ jobs:
                             ${RELEASE_NOTES}
     promote_android:
         docker:
-            - image: cimg/android:2024.04.1-node
+            - image: cimg/android:2024.08.1-node
         environment:
             FASTLANE_SKIP_UPDATE_CHECK: true
         parameters:
@@ -940,7 +940,7 @@ jobs:
             - notify
     promote_web:
         docker:
-            - image: cimg/node:20.12.1
+            - image: cimg/node:20.17.0
         resource_class: small
         shell: /bin/bash -eo pipefail
         steps:
@@ -969,7 +969,7 @@ jobs:
             - notify
     sentry_android:
         docker:
-            - image: cimg/node:20.12.1
+            - image: cimg/node:20.17.0
         resource_class: small
         shell: /bin/bash -eo pipefail
         steps:
@@ -989,7 +989,7 @@ jobs:
             - notify
     sentry_ios:
         docker:
-            - image: cimg/node:20.12.1
+            - image: cimg/node:20.17.0
         resource_class: small
         shell: /bin/bash -eo pipefail
         steps:
@@ -1009,7 +1009,7 @@ jobs:
             - notify
     sentry_web:
         docker:
-            - image: cimg/node:20.12.1
+            - image: cimg/node:20.17.0
         resource_class: small
         shell: /bin/bash -eo pipefail
         steps:
@@ -1032,7 +1032,7 @@ jobs:
             - notify
     upload_browserstack:
         docker:
-            - image: cimg/ruby:3.1.1
+            - image: cimg/ruby:3.2.5
         environment:
             FASTLANE_SKIP_UPDATE_CHECK: true
         parameters:

.circleci/src/jobs/build_android.yml

@@ -4,7 +4,7 @@ parameters:
     enum: [integreat, malte, integreat-e2e, integreat-test-cms, aschaffenburg]
     default: integreat
 docker:
-  - image: cimg/android:2024.04.1-node
+  - image: cimg/android:2024.08.1-node
 resource_class: large
 environment:
   TOTAL_CPUS: 4 # For resource_class large, used in metro.config.ci.js. For memory estimations see IGAPP-557

.circleci/src/jobs/build_web.yml

@@ -4,7 +4,7 @@ parameters:
     enum: [integreat, malte, integreat-test-cms, malte-test-cms, aschaffenburg, obdach]
     default: integreat
 docker:
-  - image: cimg/node:20.12.1
+  - image: cimg/node:20.17.0
 resource_class: medium
 environment:
   TOTAL_CPUS: 2 # For resource_class medium

.circleci/src/jobs/bump_version.yml

@@ -5,7 +5,7 @@ parameters:
     type: boolean
     default: false
 docker:
-  - image: cimg/node:20.12.1
+  - image: cimg/node:20.17.0
 resource_class: small
 steps:
   - checkout

.circleci/src/jobs/check.yml

@@ -1,6 +1,6 @@
 # Run checks and tests.
 docker:
-  - image: cimg/node:20.12.1
+  - image: cimg/node:20.17.0
 resource_class: small
 environment:
   TOTAL_CPUS: 1 # For resource_class small

.circleci/src/jobs/deliver_android.yml

@@ -8,7 +8,7 @@ parameters:
     description: Whether to deliver the build to production.
     type: boolean
 docker:
-  - image: cimg/android:2024.04.1-node
+  - image: cimg/android:2024.08.1-node
 resource_class: small
 shell: /bin/bash -eo pipefail
 environment:

.circleci/src/jobs/deliver_web.yml

@@ -4,7 +4,7 @@ parameters:
     enum: [production, beta, webnext]
     type: enum
 docker:
-  - image: cimg/node:20.12.1
+  - image: cimg/node:20.17.0
 resource_class: small
 shell: /bin/bash -eo pipefail
 steps:

.circleci/src/jobs/e2e_android.yml

@@ -1,7 +1,7 @@
 docker:
   # Ruby and bundler are necessary to run e2e tests
   # Using cimg/ruby leads to the following error: /usr/bin/env: ‘ruby3.0’: No such file or directory
-  - image: cimg/android:2024.04.1-node
+  - image: cimg/android:2024.08.1-node
 resource_class: small
 shell: /bin/bash -eo pipefail
 environment:

.circleci/src/jobs/e2e_ios.yml

@@ -1,7 +1,7 @@
 docker:
   # Ruby and bundler are necessary to run e2e tests
   # Using cimg/ruby leads to the following error: /usr/bin/env: ‘ruby3.0’: No such file or directory
-  - image: cimg/android:2024.04.1-node
+  - image: cimg/android:2024.08.1-node
 resource_class: small
 shell: /bin/bash -eo pipefail
 environment:

.circleci/src/jobs/e2e_web.yml

@@ -1,5 +1,5 @@
 docker:
-  - image: cimg/node:20.12.1-browsers
+  - image: cimg/node:20.17.0-browsers
   - image: selenium/standalone-chrome
 resource_class: medium
 shell: /bin/bash -eo pipefail

.circleci/src/jobs/move_release_notes.yml

@@ -1,6 +1,6 @@
 # Last step of a production delivery. Move all unreleased release notes to a new directory.
 docker:
-  - image: cimg/node:20.12.1
+  - image: cimg/node:20.17.0
 resource_class: small
 steps:
   - checkout

.circleci/src/jobs/notify_android.yml

@@ -4,7 +4,7 @@ parameters:
     description: Whether builds are delivered to the production or beta lane of the play store.
     type: boolean
 docker:
-  - image: cimg/node:20.12.1
+  - image: cimg/node:20.17.0
 resource_class: small
 steps:
   - checkout

.circleci/src/jobs/notify_ios.yml

@@ -4,7 +4,7 @@ parameters:
     description: Whether builds are delivered to the app store or testflight.
     type: boolean
 docker:
-  - image: cimg/node:20.12.1
+  - image: cimg/node:20.17.0
 resource_class: small
 steps:
   - checkout

.circleci/src/jobs/notify_web.yml

@@ -4,7 +4,7 @@ parameters:
     description: Whether builds are delivered to production or beta.
     type: boolean
 docker:
-  - image: cimg/node:20.12.1
+  - image: cimg/node:20.17.0
 resource_class: small
 steps:
   - checkout

.circleci/src/jobs/promote_android.yml

@@ -5,7 +5,7 @@ parameters:
     enum: [integreat, malte, aschaffenburg]
     default: integreat
 docker:
-  - image: cimg/android:2024.04.1-node
+  - image: cimg/android:2024.08.1-node
 resource_class: small
 shell: /bin/bash -eo pipefail
 environment:

.circleci/src/jobs/promote_web.yml

@@ -1,5 +1,5 @@
 docker:
-  - image: cimg/node:20.12.1
+  - image: cimg/node:20.17.0
 resource_class: small
 shell: /bin/bash -eo pipefail
 steps:

.circleci/src/jobs/sentry_android.yml

@@ -1,6 +1,6 @@
 # Upload the Android sourcemaps to sentry
 docker:
-  - image: cimg/node:20.12.1
+  - image: cimg/node:20.17.0
 resource_class: small
 shell: /bin/bash -eo pipefail
 steps:

.circleci/src/jobs/sentry_ios.yml

@@ -1,6 +1,6 @@
 # Upload the iOS sourcemaps to sentry
 docker:
-  - image: cimg/node:20.12.1
+  - image: cimg/node:20.17.0
 resource_class: small
 shell: /bin/bash -eo pipefail
 steps:

.circleci/src/jobs/sentry_web.yml

@@ -1,6 +1,6 @@
 # Upload the web sourcemaps to sentry
 docker:
-  - image: cimg/node:20.12.1
+  - image: cimg/node:20.17.0
 resource_class: small
 shell: /bin/bash -eo pipefail
 steps:

.circleci/src/jobs/upload_browserstack.yml

@@ -4,7 +4,7 @@ parameters:
     type: string
     description: the name of the file to upload
 docker:
-  - image: cimg/ruby:3.1.1
+  - image: cimg/ruby:3.2.5
 resource_class: small
 shell: /bin/bash -eo pipefail
 environment:

.eslintrc.js

@@ -195,6 +195,12 @@ module.exports = {
         'unicorn/prefer-node-protocol': 'error',
       },
     },
+    {
+      files: ['e2e-tests/**'],
+      rules: {
+        '@typescript-eslint/await-thenable': 'off',
+      },
+    },
   ],
   reportUnusedDisableDirectives: true,
   settings: {

docs/e2e-tests.md

@@ -9,10 +9,6 @@ To run the E2e-tests take a look at the commands in the [package.json](../e2e-te
 local selenium server, connect to browserstack and to select the correct chromedriver. Additionally, it can be
 configured to run multiple E2E-tests in parallel.
 
-> **Note**
-> WebdriverIO provides selectors for react components. However, they do not work properly for internet explorer in web.
-> Therefore, you should use more primitive selectors instead (like xpath).
-
 ## Browserstack
 
 Browserstack provides you with a large set of available operating systems, browser, and browser versions.

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/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)
   },
 }