@ui5/webcomponents-base 0.0.0-2c7615fe9 → 0.0.0-3236d56be

package/dist/sap/base/Log.js

@@ -162,18 +162,10 @@ function log(iLevel, sMessage, sDetails, sComponent, fnSupportInfo) {
                 }
                 break;
             case Log.Level.DEBUG:
-                if (console.debug) {
-                    isDetailsError ? console.debug(logText, '\n', sDetails) : console.debug(logText);
-                } else {
-                    isDetailsError ? console.log(logText, '\n', sDetails) : console.log(logText);
-                }
+                isDetailsError ? console.debug(logText, '\n', sDetails) : console.debug(logText);
                 break;
             case Log.Level.TRACE:
-                if (console.trace) {
-                    isDetailsError ? console.trace(logText, '\n', sDetails) : console.trace(logText);
-                } else {
-                    isDetailsError ? console.log(logText, '\n', sDetails) : console.log(logText);
-                }
+                isDetailsError ? console.trace(logText, '\n', sDetails) : console.trace(logText);
                 break;
             }
             if (console.info && oLogEntry.supportInfo) {

package/dist/sap/base/assert.js

@@ -2,11 +2,7 @@ import Log from './Log.js';
 var fnAssert = function (bResult, vMessage) {
     if (!bResult) {
         var sMessage = typeof vMessage === 'function' ? vMessage() : vMessage;
-        if (console && console.assert) {
-            console.assert(bResult, sMessage);
-        } else {
-            Log.debug('[Assertions] ' + sMessage);
-        }
+        console.assert(bResult, sMessage);
     }
 };
 export default fnAssert;

package/dist/sap/base/security/encodeCSS.js

@@ -0,0 +1,14 @@
+import toHex from '../strings/toHex.js';
+var rCSS = /[\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\xff\u2028\u2029][0-9A-Fa-f]?/g;
+var fnCSS = function (sChar) {
+    var iChar = sChar.charCodeAt(0);
+    if (sChar.length === 1) {
+        return '\\' + toHex(iChar);
+    } else {
+        return '\\' + toHex(iChar) + ' ' + sChar.substr(1);
+    }
+};
+var fnEncodeCSS = function (sString) {
+    return sString.replace(rCSS, fnCSS);
+};
+export default fnEncodeCSS;

package/dist/sap/base/security/encodeXML.js

@@ -0,0 +1,23 @@
+import toHex from '../strings/toHex.js';
+var rHtml = /[\x00-\x2b\x2f\x3a-\x40\x5b-\x5e\x60\x7b-\xff\u2028\u2029]/g, rHtmlReplace = /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f-\x9f]/, mHtmlLookup = {
+        '<': '&lt;',
+        '>': '&gt;',
+        '&': '&amp;',
+        '"': '&quot;'
+    };
+var fnHtml = function (sChar) {
+    var sEncoded = mHtmlLookup[sChar];
+    if (!sEncoded) {
+        if (rHtmlReplace.test(sChar)) {
+            sEncoded = '&#xfffd;';
+        } else {
+            sEncoded = '&#x' + toHex(sChar.charCodeAt(0)) + ';';
+        }
+        mHtmlLookup[sChar] = sEncoded;
+    }
+    return sEncoded;
+};
+var fnEncodeXML = function (sString) {
+    return sString.replace(rHtml, fnHtml);
+};
+export default fnEncodeXML;

package/dist/sap/base/strings/toHex.js

@@ -0,0 +1,8 @@
+var fnToHex = function (iChar, iLength) {
+  var sHex = iChar.toString(16);
+  if (iLength) {
+    sHex = sHex.padStart(iLength, "0");
+  }
+  return sHex;
+};
+export default fnToHex;

package/dist/sap/ui/thirdparty/caja-html-sanitizer.js

@@ -1989,7 +1989,7 @@ if (typeof window !== 'undefined') {
 }
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 // Based on coding from the HTML4 Sanitizer by Google Inc.

package/dist/test-resources/pages/i18n.html

@@ -17,9 +17,7 @@
 		const demo = async () => {
 			["de", "es", "fr", "en"].forEach(localeId => registerI18nLoader("myApp", localeId, () => `./assets/messagebundle_${localeId}.properties`));
 
-			await fetchI18nBundle("myApp");
-
-			const bundle = getI18nBundle("myApp");
+			const bundle = await getI18nBundle("myApp");
 
 			const pleaseWait = bundle.getText("PLEASE_WAIT");
 			console.log("Please wait in the current language is: ", pleaseWait);

package/dist/test-resources/specs/ConfigurationChange.spec.js

@@ -1,27 +1,27 @@
 const assert = require("chai").assert;
 
 describe("Some configuration options can be changed at runtime", () => {
-	before(() => {
-		browser.url("http://localhost:9191/test-resources/pages/Configuration.html");
+	before(async () => {
+		await browser.url("http://localhost:9191/test-resources/pages/Configuration.html");
 	});
 
-	it("Tests that theme can be changed", () => {
+	it("Tests that theme can be changed", async () => {
 		const newTheme = 'sap_belize_hcb';
 
-		const res = browser.executeAsync( async (newTheme, done) => {
+		const res = await browser.executeAsync( async (newTheme, done) => {
 			const config = window['sap-ui-webcomponents-bundle'].configuration;
 			await config.setTheme(newTheme);
-			return done(config.getTheme());
+			done(config.getTheme());
 		}, newTheme);
 		assert.strictEqual(res, newTheme, "Theme changed to HCB");
 	});
 
-	it("Tests that noConflict can be changed", () => {
-		const res = browser.execute( () => {
+	it("Tests that noConflict can be changed", async () => {
+		const res = await browser.executeAsync(done => {
 			const config = window['sap-ui-webcomponents-bundle'].configuration;
 			config.setNoConflict({events: ["selection-change"]});
-			return config.getNoConflict();
+			done(config.getNoConflict());
 		});
-		assert.strictEqual(res.events.includes("selection-change"), true, "selection-change was successfully registered as a no conflict event");
+		assert.include(res.events, "selection-change", "selection-change was successfully registered as a no conflict event");
 	});
 });

package/dist/test-resources/specs/ConfigurationScript.spec.js

@@ -1,62 +1,62 @@
 const assert = require("chai").assert;
 
 describe("Configuration script has effect", () => {
-	before(() => {
-		browser.url("http://localhost:9191/test-resources/pages/ConfigurationScript.html?do-not-change-configuration");
+	before(async () => {
+		await browser.url("http://localhost:9191/test-resources/pages/ConfigurationScript.html?do-not-change-configuration");
 	});
 
-	it("Tests that RTL is applied", () => {
-		const res = browser.execute( () => {
+	it("Tests that RTL is applied", async () => {
+		const res = await browser.executeAsync(done => {
 			const config = window['sap-ui-webcomponents-bundle'].configuration;
-			return config.getRTL();
+			done(config.getRTL());
 		});
 		assert.strictEqual(res, true, "RTL is true");
 	});
 
-	it("Tests that language is applied", () => {
-		const res = browser.execute( () => {
+	it("Tests that language is applied", async () => {
+		const res = await browser.executeAsync(done => {
 			const config = window['sap-ui-webcomponents-bundle'].configuration;
-			return config.getLanguage();
+			done(config.getLanguage());
 		});
 		assert.strictEqual(res, 'ja', "language is japanese");
 	});
 
-	it("Tests that calendarType is applied", () => {
-		const res = browser.execute( () => {
+	it("Tests that calendarType is applied", async () => {
+		const res = await browser.executeAsync(done => {
 			const config = window['sap-ui-webcomponents-bundle'].configuration;
-			return config.getCalendarType();
+			done(config.getCalendarType());
 		});
 		assert.strictEqual(res, 'Japanese', "calendarType is japanese");
 	});
 
-	it("Tests that formatSettings are applied", () => {
-		const res = browser.execute( () => {
+	it("Tests that formatSettings are applied", async () => {
+		const res = await browser.executeAsync(done => {
 			const config = window['sap-ui-webcomponents-bundle'].configuration;
-			return config.getFirstDayOfWeek();
+			done(config.getFirstDayOfWeek());
 		});
 		assert.strictEqual(res, 0, "First day of week is applied");
 	});
 
-	it("Tests that theme is applied", () => {
-		const res = browser.execute( () => {
+	it("Tests that theme is applied", async () => {
+		const res = await browser.executeAsync(done => {
 			const config = window['sap-ui-webcomponents-bundle'].configuration;
-			return config.getTheme();
+			done(config.getTheme());
 		});
 		assert.strictEqual(res, 'sap_belize_hcb', "Thems is HCB");
 	});
 
-	it("Tests that noConflict is applied", () => {
-		const res = browser.execute( () => {
+	it("Tests that noConflict is applied", async () => {
+		const res = await browser.executeAsync(done => {
 			const config = window['sap-ui-webcomponents-bundle'].configuration;
-			return config.getNoConflict();
+			done(config.getNoConflict());
 		});
-		assert.strictEqual(res.events.includes("selection-change"), true, "selectionChange was successfully registered as a no conflict event");
+		assert.include(res.events, "selection-change", "selectionChange was successfully registered as a no conflict event");
 	});
 
-	it("Tests that animationMode is applied", () => {
-		const res = browser.execute( () => {
+	it("Tests that animationMode is applied", async () => {
+		const res = await browser.executeAsync(done => {
 			const config = window['sap-ui-webcomponents-bundle'].configuration;
-			return config.getAnimationMode();
+			done(config.getAnimationMode());
 		});
 		assert.strictEqual(res, 'basic', "animationMode is basic");
 	});

package/dist/test-resources/specs/ConfigurationURL.spec.js

@@ -1,46 +1,46 @@
 const assert = require("chai").assert;
 
 describe("Some settings can be set via SAP UI URL params", () => {
-	before(() => {
-		browser.url("http://localhost:9191/test-resources/pages/Configuration.html?sap-ui-rtl=true&sap-ui-language=ja&sap-ui-calendarType=Japanese&sap-ui-theme=sap_belize_hcb&sap-ui-animationMode=basic");
+	before(async () => {
+		await browser.url("http://localhost:9191/test-resources/pages/Configuration.html?sap-ui-rtl=true&sap-ui-language=ja&sap-ui-calendarType=Japanese&sap-ui-theme=sap_belize_hcb&sap-ui-animationMode=basic");
 	});
 
-	it("Tests that RTL is applied", () => {
-		const res = browser.execute( () => {
+	it("Tests that RTL is applied", async () => {
+		const res = await browser.executeAsync(done => {
 			const config = window['sap-ui-webcomponents-bundle'].configuration;
-			return config.getRTL();
+			done(config.getRTL());
 		});
 		assert.strictEqual(res, true, "RTL is true");
 	});
 
-	it("Tests that language is applied", () => {
-		const res = browser.execute( () => {
+	it("Tests that language is applied", async () => {
+		const res = await browser.executeAsync(done => {
 			const config = window['sap-ui-webcomponents-bundle'].configuration;
-			return config.getLanguage();
+			done(config.getLanguage());
 		});
 		assert.strictEqual(res, 'ja', "language is japanese");
 	});
 
-	it("Tests that calendarType is applied", () => {
-		const res = browser.execute( () => {
+	it("Tests that calendarType is applied", async () => {
+		const res = await browser.executeAsync(done => {
 			const config = window['sap-ui-webcomponents-bundle'].configuration;
-			return config.getCalendarType();
+			done(config.getCalendarType());
 		});
 		assert.strictEqual(res, 'Japanese', "calendarType is japanese");
 	});
 
-	it("Tests that theme is applied", () => {
-		const res = browser.execute( () => {
+	it("Tests that theme is applied", async () => {
+		const res = await browser.executeAsync(done => {
 			const config = window['sap-ui-webcomponents-bundle'].configuration;
-			return config.getTheme();
+			done(config.getTheme());
 		});
 		assert.strictEqual(res, 'sap_belize_hcb', "Thems is HCB");
 	});
 
-	it("Tests that animationMode is applied", () => {
-		const res = browser.execute( () => {
+	it("Tests that animationMode is applied", async () => {
+		const res = await browser.executeAsync(done => {
 			const config = window['sap-ui-webcomponents-bundle'].configuration;
-			return config.getAnimationMode();
+			done(config.getAnimationMode());
 		});
 		assert.strictEqual(res, 'basic', "animationMode is basic");
 	});
@@ -48,22 +48,22 @@ describe("Some settings can be set via SAP UI URL params", () => {
 
 
 describe("Some settings can be set via SAP URL params", () => {
-	before(() => {
-		browser.url("http://localhost:9191/test-resources/pages/Configuration.html?sap-language=bg&sap-theme=sap_fiori_3_dark");
+	before(async () => {
+		await browser.url("http://localhost:9191/test-resources/pages/Configuration.html?sap-language=bg&sap-theme=sap_fiori_3_dark");
 	});
 
-	it("Tests that language is applied", () => {
-		const res = browser.execute( () => {
+	it("Tests that language is applied", async () => {
+		const res = await browser.executeAsync(done => {
 			const config = window['sap-ui-webcomponents-bundle'].configuration;
-			return config.getLanguage();
+			done(config.getLanguage());
 		});
 		assert.strictEqual(res, 'bg', "language is bulgarian");
 	});
 
-	it("Tests that theme is applied", () => {
-		const res = browser.execute( () => {
+	it("Tests that theme is applied", async () => {
+		const res = await browser.executeAsync(done => {
 			const config = window['sap-ui-webcomponents-bundle'].configuration;
-			return config.getTheme();
+			done(config.getTheme());
 		});
 		assert.strictEqual(res, 'sap_fiori_3_dark', "Thems is Fiori Dark");
 	});
@@ -71,22 +71,22 @@ describe("Some settings can be set via SAP URL params", () => {
 
 
 describe("SAP UI params take precedence over the SAP params", () => {
-	before(() => {
-		browser.url("http://localhost:9191/test-resources/pages/Configuration.html?sap-language=bg&sap-ui-language=de&sap-theme=sap_fiori_3_dark&sap-theme=sap_fiori_3_hcb");
+	before(async () => {
+		await browser.url("http://localhost:9191/test-resources/pages/Configuration.html?sap-language=bg&sap-ui-language=de&sap-theme=sap_fiori_3_dark&sap-theme=sap_fiori_3_hcb");
 	});
 
-	it("Tests that language is applied via sap-ui-language", () => {
-		const res = browser.execute( () => {
+	it("Tests that language is applied via sap-ui-language", async () => {
+		const res = await browser.executeAsync(done => {
 			const config = window['sap-ui-webcomponents-bundle'].configuration;
-			return config.getLanguage();
+			done(config.getLanguage());
 		});
 		assert.strictEqual(res, 'de', "language is german");
 	});
 
-	it("Tests that theme is applied via sap-ui-theme", () => {
-		const res = browser.execute( () => {
+	it("Tests that theme is applied via sap-ui-theme", async () => {
+		const res = await browser.executeAsync(done => {
 			const config = window['sap-ui-webcomponents-bundle'].configuration;
-			return config.getTheme();
+			done(config.getTheme());
 		});
 		assert.strictEqual(res, 'sap_fiori_3_hcb', "Thems is Fiori HCB");
 	});

package/dist/test-resources/specs/CustomTheme.spec.js

@@ -1,14 +1,14 @@
 const assert = require("chai").assert;
 
 describe("Custom themes can be registered", () => {
-	before(() => {
-		browser.url("http://localhost:9191/test-resources/pages/AllTestElements.html");
+	before(async () => {
+		await browser.url("http://localhost:9191/test-resources/pages/AllTestElements.html");
 	});
 
-	it("Tests that theme parameters are changed on theme change", () => {
+	it("Tests that theme parameters are changed on theme change", async () => {
 		const newTheme = 'my_custom_theme';
 
-		const res = browser.executeAsync( async (newTheme, done) => {
+		const res = await browser.executeAsync( async (newTheme, done) => {
 			const var1 = "--var1: #555555";
 
 			window.registerThemePropertiesLoader("@ui5/webcomponents-base-test", newTheme, () => `:root{ ${var1}; }`);
@@ -16,9 +16,9 @@ describe("Custom themes can be registered", () => {
 			const config = window['sap-ui-webcomponents-bundle'].configuration;
 			await config.setTheme(newTheme);
 
-			const style = document.querySelector(`style[data-ui5-theme-properties="@ui5/webcomponents-base-test"]`);
-			const varsFound = style && style.textContent.includes(var1);
-			return done(varsFound);
+			const style = document.adoptedStyleSheets.find(sh => sh._ui5StyleId === "data-ui5-theme-properties|@ui5/webcomponents-base-test").cssRules[0].cssText;
+			const varsFound = style && style.includes(var1);
+			done(varsFound);
 		}, newTheme);
 
 		assert.strictEqual(res, true, "Theme parameters changed");

package/dist/test-resources/specs/EventProvider.spec.js

@@ -0,0 +1,63 @@
+const assert = require("chai").assert;
+
+describe("Event provider attaches and detaches listeners properly", () => {
+	before(async () => {
+		await browser.url("http://localhost:9191/test-resources/pages/AllTestElements.html");
+	});
+
+	it("Tests that listeners can be removed (1 listener)", async () => {
+
+		const res = await browser.executeAsync(done => {
+			let timesCalled = 0;
+			const ep = new window["sap-ui-webcomponents-bundle"].EventProvider();
+			const callback = () => {
+				timesCalled++;
+			};
+
+			// Setup
+			ep.attachEvent("test", callback);
+
+			// Act
+			ep.fireEvent("test"); // should execute the callback and increase the counter
+
+			// Setup
+			ep.detachEvent("test", callback);
+
+			// Act
+			ep.fireEvent("test"); // should not execute the callback and increase the counter
+
+			done(timesCalled);
+		});
+
+		assert.strictEqual(res, 1, "The callback should be called exactly once");
+	});
+
+	it("Tests that listeners can be removed (more than 1 listener)", async () => {
+
+		const res = await browser.executeAsync(done => {
+			let timesCalled = 0;
+			const ep = new window["sap-ui-webcomponents-bundle"].EventProvider();
+			const callback = () => {
+				timesCalled++;
+			};
+			const somePreviousCallback = () => {};
+
+			// Setup
+			ep.attachEvent("test", somePreviousCallback); // Attach something so that after detachEvent the listeners array is not empty!
+			ep.attachEvent("test", callback);
+
+			// Act
+			ep.fireEvent("test"); // should execute the callback and increase the counter
+
+			// Setup
+			ep.detachEvent("test", callback);
+
+			// Act
+			ep.fireEvent("test"); // should not execute the callback and increase the counter
+
+			done(timesCalled);
+		});
+
+		assert.strictEqual(res, 1, "The callback should be called exactly once");
+	});
+});

package/dist/test-resources/specs/StaticArea.spec.js

@@ -1,26 +1,26 @@
 const assert = require("chai").assert;
 
 describe("Some configuration options can be changed at runtime", () => {
-	before(() => {
-		browser.url("http://localhost:9191/test-resources/pages/AllTestElements.html");
+	before(async () => {
+		await browser.url("http://localhost:9191/test-resources/pages/AllTestElements.html");
 	});
 
-	it("Tests control with no static area item", () => {
-		const componentId = browser.$("#no-static-area").getProperty("_id");
-		const staticArea = browser.$("ui5-static-area");
+	it("Tests control with no static area item", async () => {
+		const componentId = await browser.$("#no-static-area").getProperty("_id");
+		const staticArea = await browser.$("ui5-static-area");
 
-		assert.notOk(staticArea.$(`.${componentId}`).isExisting(), "No static area item is defined for this control");
+		assert.notOk(await staticArea.$(`.${componentId}`).isExisting(), "No static area item is defined for this control");
 	});
 
-	it("Tests control with static area item", () => {
-		const componentId = browser.$("#with-static-area").getProperty("_id");
-		const staticArea = browser.$("ui5-static-area");
+	it("Tests control with static area item", async () => {
+		const componentId = await browser.$("#with-static-area").getProperty("_id");
+		const staticArea = await browser.$("ui5-static-area");
 
-		assert.ok(staticArea.$(`.${componentId}`).isExisting(), "No static area item is defined for this control");
+		assert.ok(await staticArea.$(`.${componentId}`).isExisting(), "No static area item is defined for this control");
 	});
 
-	it("Tests removing an element with static area", () => {
-		const result = browser.execute(() => {
+	it("Tests removing an element with static area", async () => {
+		const result = await browser.executeAsync(done => {
 			let res = true;
 			window.onerror = (errorMsg, url, lineNumber) => {
 				res = false;
@@ -28,51 +28,51 @@ describe("Some configuration options can be changed at runtime", () => {
 
 			document.querySelector("#no-static-area").remove();
 
-			return res;
+			done(res);
 		});
 
 		assert.ok(result, "Static area removed from DOM successfully");
 	});
 
-	it("Test RTL not set for static area items", () => {
-		const componentId = browser.$("#with-static-area").getProperty("_id");
-		const staticArea = browser.$("ui5-static-area");
+	it("Test RTL not set for static area items", async () => {
+		const componentId = await browser.$("#with-static-area").getProperty("_id");
+		const staticArea = await browser.$("ui5-static-area");
 
-		assert.notOk(staticArea.$(`.${componentId}`).getAttribute("dir"), "dir attribute not set for static area item");
+		assert.notOk(await staticArea.$(`.${componentId}`).getAttribute("dir"), "dir attribute not set for static area item");
 	});
 
-	it("Test RTL set for static area items", () => {
-		const componentId = browser.$("#with-static-area-rtl").getProperty("_id");
-		const staticArea = browser.$("ui5-static-area");
+	it("Test RTL set for static area items", async () => {
+		const componentId = await browser.$("#with-static-area-rtl").getProperty("_id");
+		const staticArea = await browser.$("ui5-static-area");
 
-		assert.equal(staticArea.$(`.${componentId}`).getAttribute("dir"), "rtl", "dir property correctly set for static area item");
+		assert.equal(await staticArea.$(`.${componentId}`).getAttribute("dir"), "rtl", "dir property correctly set for static area item");
 	});
 
-	it("Test setting RTL for a static area item owner", () => {
-		const componentId = browser.$("#with-static-area").getProperty("_id");
-		const staticArea = browser.$("ui5-static-area");
+	it("Test setting RTL for a static area item owner", async () => {
+		const componentId = await browser.$("#with-static-area").getProperty("_id");
+		const staticArea = await browser.$("ui5-static-area");
 
-		browser.$("#with-static-area").setAttribute("dir", "rtl");
-		browser.executeAsync( async (done) => {
+		await browser.$("#with-static-area").setAttribute("dir", "rtl");
+		await browser.executeAsync( async (done) => {
 			await window["sap-ui-webcomponents-bundle"].applyDirection();
 			await window["sap-ui-webcomponents-bundle"].renderFinished();
 
-			return done();
+			done();
 		});
-		assert.equal(staticArea.$(`.${componentId}`).getAttribute("dir"), "rtl", "dir attribute dynamically set for static area item owner");
+		assert.equal(await staticArea.$(`.${componentId}`).getAttribute("dir"), "rtl", "dir attribute dynamically set for static area item owner");
 	});
 
-	it("Test removing RTL for a static area item owner", () => {
-		const componentId = browser.$("#with-static-area-rtl").getProperty("_id");
-		const staticArea = browser.$("ui5-static-area");
+	it("Test removing RTL for a static area item owner", async () => {
+		const componentId = await browser.$("#with-static-area-rtl").getProperty("_id");
+		const staticArea = await browser.$("ui5-static-area");
 
-		browser.$("#with-static-area-rtl-container").removeAttribute("dir");
-		browser.executeAsync( async (done) => {
+		await browser.$("#with-static-area-rtl-container").removeAttribute("dir");
+		await browser.executeAsync( async (done) => {
 			await window["sap-ui-webcomponents-bundle"].applyDirection();
 			await window["sap-ui-webcomponents-bundle"].renderFinished();
 
-			return done();
+			done();
 		});
-		assert.notOk(staticArea.$(`.${componentId}`).getAttribute("dir"), "dir attribute dynamically removed for static area item owner");
+		assert.notOk(await staticArea.$(`.${componentId}`).getAttribute("dir"), "dir attribute dynamically removed for static area item owner");
 	});
 });

package/dist/test-resources/specs/Theming.spec.js

@@ -1,30 +1,30 @@
 const assert = require("chai").assert;
 
 describe("Theming works", () => {
-	before(() => {
-		browser.url("http://localhost:9191/test-resources/pages/AllTestElements.html");
+	before(async () => {
+		await browser.url("http://localhost:9191/test-resources/pages/AllTestElements.html");
 	});
 
-	it("Tests that the parameters for the default theme are embedded on boot", () => {
+	it("Tests that the parameters for the default theme are embedded on boot", async () => {
 
-		const res = browser.execute(() => {
-			const style = document.querySelector(`style[data-ui5-theme-properties="@ui5/webcomponents-base-test"]`);
-			return style && style.textContent.includes("--var1: red"); // see test/assets/Themes.js
+		const res = await browser.executeAsync(done => {
+			const style = document.adoptedStyleSheets.find(sh => sh._ui5StyleId === "data-ui5-theme-properties|@ui5/webcomponents-base-test").cssRules[0].cssText
+			done(style && style.includes("--var1: red")); // see test/assets/Themes.js
 		});
 
 		assert.strictEqual(res, true, "The fiori3 vars are found");
 	});
 
-	it("Tests that theme parameters are changed on theme change", () => {
+	it("Tests that theme parameters are changed on theme change", async () => {
 		const newTheme = 'sap_belize_hcb';
 
-		const res = browser.executeAsync( async (newTheme, done) => {
+		const res = await browser.executeAsync( async (newTheme, done) => {
 			const config = window['sap-ui-webcomponents-bundle'].configuration;
 			await config.setTheme(newTheme);
 
-			const style = document.querySelector(`style[data-ui5-theme-properties="@ui5/webcomponents-base-test"]`);
-			const varsFound = style && style.textContent.includes("--var1: orange"); // see test/assets/Themes.js
-			return done(varsFound);
+			const style = document.adoptedStyleSheets.find(sh => sh._ui5StyleId === "data-ui5-theme-properties|@ui5/webcomponents-base-test").cssRules[0].cssText
+			const varsFound = style && style.includes("--var1: orange"); // see test/assets/Themes.js
+			done(varsFound);
 		}, newTheme);
 
 		assert.strictEqual(res, true, "Theme parameters changed");