Merge branch 'main' of github.com:ui5-community/wdi5

ui5-community · Oct 21, 2024 · 6f02f00 · 6f02f00
2 parents e86a1eb + db50421
commit 6f02f00
Show file tree

Hide file tree

Showing 7 changed files with 501 additions and 1,179 deletions.
diff --git a/examples/cap-bookshop-wdi5 b/examples/cap-bookshop-wdi5
diff --git a/examples/ui5-ts-app/test/e2e/authentication/wdio-base.conf.ts b/examples/ui5-ts-app/test/e2e/authentication/wdio-base.conf.ts
@@ -1,5 +1,5 @@
 import { join, resolve } from "path"
-import merge from "ts-deepmerge"
+import { merge } from "ts-deepmerge"
 import { wdi5Config } from "wdio-ui5-service"
 import { config as bstackConfig, browser } from "../cloud-services/browserstack.conf.local.js"
 type _wdi5Config = Omit<wdi5Config, "capabilities">

diff --git a/examples/ui5-ts-app/test/e2e/authentication/wdio-basic-auth-authentication.conf.ts b/examples/ui5-ts-app/test/e2e/authentication/wdio-basic-auth-authentication.conf.ts
@@ -1,4 +1,4 @@
-import merge from "ts-deepmerge"
+import { merge } from "ts-deepmerge"
 import { config as baseConf } from "./wdio-base.conf.js"
 
 const _config = {
@@ -30,8 +30,8 @@ if (process.env.BROWSERSTACK) {
                     process.argv.indexOf("--headless") > -1
                         ? ["headless", "disable-gpu"]
                         : process.argv.indexOf("--debug") > -1
-                        ? ["window-size=1440,800", "--auto-open-devtools-for-tabs"]
-                        : ["window-size=1440,800"]
+                          ? ["window-size=1440,800", "--auto-open-devtools-for-tabs"]
+                          : ["window-size=1440,800"]
             },
             acceptInsecureCerts: true
         }

diff --git a/examples/ui5-ts-app/test/e2e/authentication/wdio-btp-authentication-multiremote.conf.ts b/examples/ui5-ts-app/test/e2e/authentication/wdio-btp-authentication-multiremote.conf.ts
@@ -1,4 +1,4 @@
-import merge from "ts-deepmerge"
+import { merge } from "ts-deepmerge"
 import { wdi5MultiRemoteCapability } from "wdio-ui5-service"
 import { config as baseConf } from "./wdio-base.conf.js"
 import { browser } from "../cloud-services/browserstack.conf.local.js"
@@ -38,8 +38,8 @@ if (process.env.BROWSERSTACK) {
                         process.argv.indexOf("--headless") > -1
                             ? ["headless", "disable-gpu"]
                             : process.argv.indexOf("--debug") > -1
-                            ? ["window-size=1440,800", "--auto-open-devtools-for-tabs"]
-                            : ["window-size=1440,800"]
+                              ? ["window-size=1440,800", "--auto-open-devtools-for-tabs"]
+                              : ["window-size=1440,800"]
                 },
                 acceptInsecureCerts: true
             }
@@ -55,8 +55,8 @@ if (process.env.BROWSERSTACK) {
                         process.argv.indexOf("--headless") > -1
                             ? ["--headless"]
                             : process.argv.indexOf("--debug") > -1
-                            ? ["window-size=1440,800", "--auto-open-devtools-for-tabs"]
-                            : ["window-size=1440,800"]
+                              ? ["window-size=1440,800", "--auto-open-devtools-for-tabs"]
+                              : ["window-size=1440,800"]
                 },
                 acceptInsecureCerts: true
             }

diff --git a/examples/ui5-ts-app/test/e2e/authentication/wdio-btp-authentication.conf.ts b/examples/ui5-ts-app/test/e2e/authentication/wdio-btp-authentication.conf.ts
@@ -1,4 +1,4 @@
-import merge from "ts-deepmerge"
+import { merge } from "ts-deepmerge"
 import { config as baseConf } from "./wdio-base.conf.js"
 
 const _config = {
@@ -30,8 +30,8 @@ if (process.env.BROWSERSTACK) {
                     process.argv.indexOf("--headless") > -1
                         ? ["headless", "disable-gpu"]
                         : process.argv.indexOf("--debug") > -1
-                        ? ["window-size=1440,800", "--auto-open-devtools-for-tabs"]
-                        : ["window-size=1440,800"]
+                          ? ["window-size=1440,800", "--auto-open-devtools-for-tabs"]
+                          : ["window-size=1440,800"]
             },
             acceptInsecureCerts: true
         }

diff --git a/examples/ui5-ts-app/test/e2e/authentication/wdio-custom-authentication.conf.ts b/examples/ui5-ts-app/test/e2e/authentication/wdio-custom-authentication.conf.ts
@@ -1,4 +1,4 @@
-import merge from "ts-deepmerge"
+import { merge } from "ts-deepmerge"
 import { config as baseConf } from "./wdio-base.conf.js"
 import { resolve } from "path"
 
@@ -41,8 +41,8 @@ if (process.env.BROWSERSTACK) {
                     process.argv.indexOf("--headless") > -1
                         ? ["headless", "disable-gpu"]
                         : process.argv.indexOf("--debug") > -1
-                        ? ["window-size=1440,800", "--auto-open-devtools-for-tabs"]
-                        : ["window-size=1440,800"]
+                          ? ["window-size=1440,800", "--auto-open-devtools-for-tabs"]
+                          : ["window-size=1440,800"]
             },
             acceptInsecureCerts: true
         }