Merge branch 'main' into application-wizard-2-with-api-and-tests

* main:
  web: add webdriverIO testing layer (#6959)

tests/wdio/test/pageobjects/admin.page.ts

@@ -1,5 +1,5 @@
-import { browser } from "@wdio/globals";
 import Page from "../pageobjects/page.js";
+import { browser } from "@wdio/globals";
 
 const CLICK_TIME_DELAY = 250;
 

tests/wdio/wdio.conf.ts

@@ -157,6 +157,7 @@ export const config: Options.Testrunner = {
         ui: "bdd",
         timeout: 60000,
     },
+<<<<<<< HEAD
     //
     // =====
     // Hooks
@@ -303,4 +304,6 @@ export const config: Options.Testrunner = {
      */
     // onReload: function(oldSessionId, newSessionId) {
     // }
+=======
+>>>>>>> main
 };