@sap_oss/wdio-qmate-service 2.6.4 → 2.6.5

package/test/reuse/common/userInteraction/fillActiveAndRetry.spec.js

@@ -1,9 +1,6 @@
-const {
-  handleCookiesConsent
-} = require("../../../helper/utils");
+const { handleCookiesConsent } = require("../../../helper/utils");
 
 describe("userInteraction - fillActiveAndRetry", function () {
-
   let value;
   let actualValue;
 
@@ -14,10 +11,10 @@ describe("userInteraction - fillActiveAndRetry", function () {
 
   it("Execution", async function () {
     const selector = {
-      "elementProperties": {
-        "viewName": "sap.ui.demo.cart.view.Home",
-        "metadata": "sap.m.SearchField",
-        "id": "*searchField"
+      elementProperties: {
+        viewName: "sap.ui.demo.cart.view.Home",
+        metadata: "sap.m.SearchField",
+        id: "*searchField"
       }
     };
 
@@ -37,7 +34,6 @@ describe("userInteraction - fillActiveAndRetry", function () {
 });
 
 describe("userInteraction - fillActiveAndRetry - invalid selector", function () {
-
   it("Preparation", async function () {
     await browser.navigateTo("https://sapui5.hana.ondemand.com/1.99.0/test-resources/sap/m/demokit/cart/webapp/index.html?sap-ui-theme=sap_fiori_3");
     await handleCookiesConsent();
@@ -45,19 +41,17 @@ describe("userInteraction - fillActiveAndRetry - invalid selector", function ()
 
   it("Execution & Verification", async function () {
     const selector = {
-      "elementProperties": {
-        "viewName": "sap.ui.demo.cart.view.Home",
-        "metadata": "sap.eld"
+      elementProperties: {
+        viewName: "sap.ui.demo.cart.view.Home",
+        metadata: "sap.eld"
       }
     };
 
-    await expect(ui5.userInteraction.click(selector))
-      .rejects.toThrow(/uiControlExecuteLocator\(\): No visible elements found/);
+    await expect(ui5.userInteraction.click(selector)).rejects.toThrow(/uiControlExecuteLocator\(\): No visible elements found/);
   });
 });
 
 describe("userInteraction - fillActiveAndRetry - element with number", function () {
-
   let value;
   let actualValue;
 
@@ -68,10 +62,10 @@ describe("userInteraction - fillActiveAndRetry - element with number", function
 
   it("Execution", async function () {
     const selector = {
-      "elementProperties": {
-        "viewName": "sap.ui.demo.cart.view.Home",
-        "metadata": "sap.m.SearchField",
-        "id": "*searchField"
+      elementProperties: {
+        viewName: "sap.ui.demo.cart.view.Home",
+        metadata: "sap.m.SearchField",
+        id: "*searchField"
       }
     };
     value = 12;
@@ -90,7 +84,6 @@ describe("userInteraction - fillActiveAndRetry - element with number", function
 });
 
 describe("userInteraction - fillActiveAndRetry - empty value", function () {
-
   let value;
 
   it("Preparation", async function () {
@@ -100,10 +93,10 @@ describe("userInteraction - fillActiveAndRetry - empty value", function () {
 
   it("Execution & Verification", async function () {
     const selector = {
-      "elementProperties": {
-        "viewName": "sap.ui.demo.cart.view.Home",
-        "metadata": "sap.m.SearchField",
-        "id": "*searchField"
+      elementProperties: {
+        viewName: "sap.ui.demo.cart.view.Home",
+        metadata: "sap.m.SearchField",
+        id: "*searchField"
       }
     };
     const index = 0;
@@ -111,12 +104,12 @@ describe("userInteraction - fillActiveAndRetry - empty value", function () {
     const retries = 1;
     const interval = 3000;
     await ui5.userInteraction.click(selector);
-    await expect(common.userInteraction.fillActiveAndRetry(value))
-      .rejects.toThrow("Retries done. Failed to execute the function: Error: Function 'fillActive' failed: Please provide a value(datatype - number/string) as argument.");
+    await expect(common.userInteraction.fillActiveAndRetry(value)).rejects.toThrow(
+      "Function 'fillActiveAndRetry' failed with: Retries done. Failed to execute the function: Please provide a value(datatype - number/string) as argument."
+    );
   });
 });
 
-
 describe("userInteraction - fillActiveAndRetry - form field", function () {
   let element;
   it("Preparation", async function () {
@@ -158,7 +151,8 @@ describe("userInteraction - fillActiveAndRetry - empty value", function () {
   it("Execution & Verification", async function () {
     // Make the form field active
     await nonUi5.userInteraction.click(element);
-    await expect(common.userInteraction.fillActiveAndRetry())
-      .rejects.toThrow("Retries done. Failed to execute the function: Error: Function 'fillActive' failed: Please provide a value(datatype - number/string) as argument.");
+    await expect(common.userInteraction.fillActiveAndRetry()).rejects.toThrow(
+      "Function 'fillActiveAndRetry' failed with: Retries done. Failed to execute the function: Please provide a value(datatype - number/string) as argument."
+    );
   });
-});
+});

package/test/reuse/helper/errorHandler/logException.spec.js

@@ -1,49 +1,55 @@
 "use strict";
 
+const { assert } = require("chai");
+
 const ErrorHandler = require("../../../../lib/reuse/helper/errorHandler").default;
 
 describe("errorHandler - logException - error message without stacktrace", async function () {
   it("Execution & Verification", async function () {
-    const errorHandler = new ErrorHandler(false);
+    const errorHandler = new ErrorHandler();
     await expect(async function display() {
-      errorHandler.logException(new Error("Divide by zero error."));
-    }).rejects.toThrow("Function 'display' failed with : Divide by zero error.");
+      errorHandler.logException(new Error("Divide by zero error."), undefined, false);
+    }).rejects.toThrow("Function 'display' failed with: Divide by zero error.");
   });
 });
 
-describe("errorHandler - logException - error message with stacktrace by passing constructor value true", async function () {
-  const errorHandler = new ErrorHandler(true);
+describe("errorHandler - logException - error message with stacktrace by passing stacktrace parameter value true", async function () {
+  const errorHandler = new ErrorHandler();
   it("Execution & Verification", async function () {
-    await expect(async function display() {
-      errorHandler.logException(new Error("File not found exception"));
-    }).rejects.toThrow(/Function 'display' failed with : File not found exception/);
+    try {
+      (function display() {
+        errorHandler.logException(new Error("File not found exception"), undefined, true);
+      })();
+    } catch (error) {
+      assert.isTrue(error.stack.toString().trim().includes(`QmateError: Function 'display' failed with: File not found exception`));
+    }
   });
 });
 
-describe("errorHandler - logException - error message with stacktrace by default constructor value", async function () {
+describe("errorHandler - logException - error message with stacktrace default value", async function () {
   const errorHandler = new ErrorHandler();
   it("Execution & Verification", async function () {
     await expect(async function display() {
       errorHandler.logException(new Error("Array index out of bound exception"));
-    }).rejects.toThrow(/Function 'display' failed with : Array index out of bound exception/);
+    }).rejects.toThrow(/Function 'display' failed with: Array index out of bound exception/);
   });
 });
 
 describe("errorHandler - logException - generic error message", async function () {
   it("Execution & Verification", async function () {
-    const errorHandler = new ErrorHandler(false);
+    const errorHandler = new ErrorHandler();
     await expect(async () => {
-      errorHandler.logException();
-    }).rejects.toThrow("Failed due to exception in block");
+      errorHandler.logException(undefined, undefined, false);
+    }).rejects.toThrow("Failed due to an exception in the code block");
   });
 });
 
 describe("errorHandler - logException - Without message", async function () {
   it("Execution & Verification", async function () {
-    const errorHandler = new ErrorHandler(false);
+    const errorHandler = new ErrorHandler();
     await expect(async function display() {
-      errorHandler.logException(new Error());
-    }).rejects.toThrow("Function 'display' failed with unknown error");
+      errorHandler.logException(new Error(), undefined, false);
+    }).rejects.toThrow("Function 'display' failed with: unknown error");
   });
 });
 
@@ -52,6 +58,6 @@ describe("errorHandler - logException - customized error message with stacktrace
   it("Execution & Verification", async function () {
     await expect(async function display() {
       errorHandler.logException(new Error(), "File not found in given path please pass the correct path");
-    }).rejects.toThrow(/Function 'display' failed with : File not found in given path please pass the correct path/);
+    }).rejects.toThrow(/Function 'display' failed with: File not found in given path please pass the correct path/);
   });
 });

package/test/reuse/nonUi5/element/getAllDisplayed.spec.js

@@ -6,7 +6,7 @@ describe("element - getAllDisplayed - error case", function () {
   });
 
   it("Execution & Verification", async function () {
-    await expect(nonUi5.element.getAllDisplayed("BUTTON[id='invalid']", 4000)).rejects.toThrow("Function 'waitForAll' failed");
+    await expect(nonUi5.element.getAllDisplayed("BUTTON[id='invalid']", 4000)).rejects.toThrow(`Function 'getAllDisplayed' failed with: No visible element(s) found for selector 'BUTTON[id='invalid']' after 4s.`);
   });
 });
 
@@ -34,6 +34,6 @@ describe("element - getAllDisplayed - invisible element (present in DOM)", funct
   });
 
   it("Execution & Verification", async function () {
-    await expect(nonUi5.element.getAllDisplayed("P[id='hiddenParagraph']")).rejects.toThrow(`Function 'getAllDisplayed' failed. No visible element(s) found for selector`);
+    await expect(nonUi5.element.getAllDisplayed("P[id='hiddenParagraph']")).rejects.toThrow(`Function 'getAllDisplayed' failed with: No visible element(s) found for selector 'P[id='hiddenParagraph']' after 30s.`);
   });
 });

package/test/reuse/nonUi5/element/getByChild.spec.js

@@ -52,7 +52,7 @@ describe("element - getByChild - error case with wrong element", function () {
     const elementSelector = ".wrongParent";
     const childSelector = ".wrongChild";
     await expect(nonUi5.element.getByChild(elementSelector, childSelector))
-      .rejects.toThrow("Function 'getByChild' failed. No element found for selector:");
+      .rejects.toThrow("Function 'getByChild' failed with: No element found for selector:");
   });
 });
 
@@ -65,6 +65,6 @@ describe("element - getByChild - error case with wrong order of parent and child
     const elementSelector = "[id='container-cart---homeView--searchField-I']";
     const childSelector = "[id='container-cart---homeView--searchField-F']";
     await expect(nonUi5.element.getByChild(elementSelector, childSelector))
-      .rejects.toThrow("Function 'getByChild' failed. The found element(s) with the given selector do(es) not have any child with selector");
+      .rejects.toThrow(`Function 'getByChild' failed with: The found element(s) with the given selector do(es) not have any child with selector [id='container-cart---homeView--searchField-F']`);
   });
 });

package/test/reuse/nonUi5/element/getByCssContainingText.spec.js

@@ -10,10 +10,7 @@ describe("element - getByCssContainingText - non strict", function () {
   });
 
   it("Execution", async function () {
-    downloadBtn = await nonUi5.element.getByCssContainingText(
-      "[id='sdk---welcome--readMoreButton-BDI-content']",
-      "Down"
-    );
+    downloadBtn = await nonUi5.element.getByCssContainingText("[id='sdk---welcome--readMoreButton-BDI-content']", "Down");
   });
 
   it("Verification", async function () {
@@ -32,14 +29,7 @@ describe("element - getByCssContainingText - strict", function () {
   });
 
   it("Execution", async function () {
-    downloadBtn = await nonUi5.element.getByCssContainingText(
-      "[id='sdk---welcome--readMoreButton-BDI-content']",
-      "Download",
-      0,
-      30000,
-      false,
-      true
-    );
+    downloadBtn = await nonUi5.element.getByCssContainingText("[id='sdk---welcome--readMoreButton-BDI-content']", "Download", 0, 30000, false, true);
   });
 
   it("Verification", async function () {
@@ -56,16 +46,9 @@ describe("element - getByCssContainingText - strict error case", function () {
   });
 
   it("Execution", async function () {
-    expect(
-      nonUi5.element.getByCssContainingText(
-        "[id='sdk---welcome--readMoreButton-BDI-content']",
-        "Down",
-        0,
-        30000,
-        false,
-        true
-      )
-    ).rejects.toThrow(/getByCssContainingText(): Element \w*|\d* not found/);
+    expect(nonUi5.element.getByCssContainingText("[id='sdk---welcome--readMoreButton-BDI-content']", "Down", 0, 30000, false, true)).rejects.toThrow(
+      /getByCssContainingText(): Element \w*|\d* not found/
+    );
   });
 });
 
@@ -76,8 +59,8 @@ describe("element - getByCssContainingText - error case", function () {
   });
 
   it("Execution & Verification", async function () {
-    await expect(
-      nonUi5.element.getByCssContainingText("[id='sdk---welcome--readMoreButton-BDI-content']", "Some Junk Text")
-    ).rejects.toThrow(/getByCssContainingText(): Element \w*|\d* not found/);
+    await expect(nonUi5.element.getByCssContainingText("[id='sdk---welcome--readMoreButton-BDI-content']", "Some Junk Text")).rejects.toThrow(
+      `Function 'getByCssContainingText' failed with: Element with CSS '[id='sdk---welcome--readMoreButton-BDI-content']' and text 'Some Junk Text' not found.`
+    );
   });
 });

package/test/reuse/nonUi5/element/getByParent.spec.js

@@ -1,13 +1,13 @@
 "use strict";
-const {
-  handleCookiesConsent
-} = require("../../../helper/utils");
+const { handleCookiesConsent } = require("../../../helper/utils");
 
 describe("element - getByParent", function () {
   let finalElement;
 
   it("Preparation", async function () {
-    await common.navigation.navigateToUrl("https://sapui5.hana.ondemand.com/1.99.0/test-resources/sap/m/demokit/cart/webapp/index.html?sap-ui-theme=sap_fiori_3#/categories");
+    await common.navigation.navigateToUrl(
+      "https://sapui5.hana.ondemand.com/1.99.0/test-resources/sap/m/demokit/cart/webapp/index.html?sap-ui-theme=sap_fiori_3#/categories"
+    );
     await handleCookiesConsent();
   });
 
@@ -15,7 +15,6 @@ describe("element - getByParent", function () {
     const elementSelector = "[id='container-cart---homeView--searchField-I']";
     const parentSelector = "[id='container-cart---homeView--searchField-F']";
     finalElement = await nonUi5.element.getByParent(elementSelector, parentSelector);
-
   });
 
   it("Verification", async function () {
@@ -46,26 +45,32 @@ describe("element - getByParent - with index", function () {
 
 describe("element - getByParent - error case with wrong element", function () {
   it("Preparation", async function () {
-    await common.navigation.navigateToUrl("https://sapui5.hana.ondemand.com/1.99.0/test-resources/sap/m/demokit/cart/webapp/index.html?sap-ui-theme=sap_fiori_3#/categories");
+    await common.navigation.navigateToUrl(
+      "https://sapui5.hana.ondemand.com/1.99.0/test-resources/sap/m/demokit/cart/webapp/index.html?sap-ui-theme=sap_fiori_3#/categories"
+    );
   });
 
   it("Execution & Verification", async function () {
     const elementSelector = ".wrongParent";
     const parentSelector = ".wrongChild";
-    await expect(nonUi5.element.getByParent(elementSelector, parentSelector))
-      .rejects.toThrow("Function 'getByParent' failed. No parent element found for selector:");
+    await expect(nonUi5.element.getByParent(elementSelector, parentSelector)).rejects.toThrow(
+      "Function 'getByParent' failed with: No parent element found for selector:"
+    );
   });
 });
 
 describe("element - getByParent - error case with wrong order of parent and child", function () {
   it("Preparation", async function () {
-    await common.navigation.navigateToUrl("https://sapui5.hana.ondemand.com/1.99.0/test-resources/sap/m/demokit/cart/webapp/index.html?sap-ui-theme=sap_fiori_3#/categories");
+    await common.navigation.navigateToUrl(
+      "https://sapui5.hana.ondemand.com/1.99.0/test-resources/sap/m/demokit/cart/webapp/index.html?sap-ui-theme=sap_fiori_3#/categories"
+    );
   });
 
   it("Execution & Verification", async function () {
     const elementSelector = "[id='container-cart---homeView--searchField-F']";
     const parentSelector = "[id='container-cart---homeView--searchField-I']";
-    await expect(nonUi5.element.getByParent(elementSelector, parentSelector))
-      .rejects.toThrow("Function 'getByParent' failed. No visible elements found for selector");
+    await expect(nonUi5.element.getByParent(elementSelector, parentSelector)).rejects.toThrow(
+      `Function 'getByParent' failed with: No visible elements found for selector '[id='container-cart---homeView--searchField-F']' and parent selector '[id='container-cart---homeView--searchField-I']`
+    );
   });
-});
+});

package/test/reuse/nonUi5/element/test.element.conf.js

@@ -23,12 +23,10 @@ exports.config = merge(profile.config, {
     path.resolve(__dirname, "getByChild.spec.js"),
     path.resolve(__dirname, "getByParent.spec.js"),
     path.resolve(__dirname, "highlight.spec.js"),
-    path.resolve(__dirname, "switchToIframe.spec.js"),
     path.resolve(__dirname, "getByName.spec.js"),
     path.resolve(__dirname, "getByCssContainingText.spec.js"),
     path.resolve(__dirname, "isVisible.spec.js"),
     path.resolve(__dirname, "isPresent.spec.js"),
-    path.resolve(__dirname, "isPresent.spec.js"),
     path.resolve(__dirname, "isPresentByCss.spec.js"),
     path.resolve(__dirname, "isPresentByXPath.spec.js"),
     path.resolve(__dirname, "setInnerHTML.spec.js")

package/test/reuse/nonUi5/element/test.element.sauceLabs.conf.js

@@ -25,12 +25,10 @@ exports.config = merge(profile.config, {
     path.resolve(__dirname, "getByChild.spec.js"),
     path.resolve(__dirname, "getByParent.spec.js"),
     path.resolve(__dirname, "highlight.spec.js"),
-    path.resolve(__dirname, "switchToIframe.spec.js"),
     path.resolve(__dirname, "getByName.spec.js"),
     path.resolve(__dirname, "getByCssContainingText.spec.js"),
     path.resolve(__dirname, "isVisible.spec.js"),
     path.resolve(__dirname, "isPresent.spec.js"),
-    path.resolve(__dirname, "isPresent.spec.js"),
     path.resolve(__dirname, "isPresentByCss.spec.js"),
     path.resolve(__dirname, "isPresentByXPath.spec.js")
   ],

package/test/reuse/nonUi5/userInteraction/clearAndFill.spec.js

@@ -50,6 +50,6 @@ describe("userInteraction - clearAndFill - a button (error case)", function () {
 
   it("Execution & Verification", async function () {
     const elem = await nonUi5.element.getById("Default", 10000);
-    await expect(nonUi5.userInteraction.clearAndFill(elem, "New test value")).rejects.toThrow(/invalid element state/);
+    await expect(nonUi5.userInteraction.clearAndFill(elem, "New test value")).rejects.toThrow(/Function 'clearAndFill' failed with: invalid element state/);
   });
 });

package/test/reuse/nonUi5/userInteraction/clearAndFillAndRetry.spec.js

@@ -50,6 +50,8 @@ describe("userInteraction - clearAndFillAndRetry - button (error case)", functio
 
   it("Execution & Verification", async function () {
     const elem = await nonUi5.element.getById("Default", 10000);
-    await expect(nonUi5.userInteraction.clearAndFillAndRetry(elem, "New test value", 1)).rejects.toThrow("Retries done. Failed to execute the function: Error: Function 'clearAndFill' failed with: invalid element state");
+    await expect(nonUi5.userInteraction.clearAndFillAndRetry(elem, "New test value", 1)).rejects.toThrow(
+      "Function 'clearAndFillAndRetry' failed with: Retries done. Failed to execute the function: invalid element state"
+    );
   });
 });

package/test/reuse/nonUi5/userInteraction/clearAndRetry.spec.js

@@ -2,7 +2,7 @@
 
 describe("userInteraction - clearAndRetry - form field", function () {
   let element;
-  
+
   it("Preparation", async function () {
     await common.navigation.navigateToUrl("http://localhost:34005/forms.html");
     element = await nonUi5.element.getById("ExampleValue1", 10000);
@@ -26,8 +26,9 @@ describe("userInteraction - clearAndRetry - no element (unhappy case)", function
   });
 
   it("Execution & Verification", async function () {
-    await expect(nonUi5.userInteraction.clearAndRetry())
-      .rejects.toThrow("Function 'clearAndRetry' failed with: Please provide an element as first argument.");
+    await expect(nonUi5.userInteraction.clearAndRetry()).rejects.toThrow(
+      "Function 'clearAndRetry' failed with: Please provide an element as first argument."
+    );
   });
 });
 
@@ -38,7 +39,6 @@ describe("userInteraction - clearAndRetry - button (unhappy case)", function ()
 
   it("Execution & Verification", async function () {
     const elem = await nonUi5.element.getById("Default", 10000);
-    await expect(nonUi5.userInteraction.clearAndRetry(elem, 1))
-      .rejects.toThrow("Retries done. Failed to execute the function: invalid element state");
+    await expect(nonUi5.userInteraction.clearAndRetry(elem, 1)).rejects.toThrow("Function 'clearAndRetry' failed with: Retries done. Failed to execute the function:");
   });
-});
+});

package/test/reuse/nonUi5/userInteraction/click.spec.js

@@ -23,7 +23,9 @@ describe("userInteraction - click - disabled button (unhappy case)", function ()
 
   it("Execution & Verification", async function () {
     const elem = await nonUi5.element.getById("Not-clickable", 10000);
-    await expect(nonUi5.userInteraction.click(elem)).rejects.toThrow(/Timeout \w*|\d* by waiting for element is clickable/); // \w*|\d* - placeholder for timeout value
+    await expect(nonUi5.userInteraction.click(elem)).rejects.toThrow(
+      /Function 'click' failed with: Timeout \w*|\d* by waiting for element is clickable/
+    ); // \w*|\d* - placeholder for timeout value
   });
 });
 

package/test/reuse/nonUi5/userInteraction/clickAndRetry.spec.js

@@ -23,7 +23,9 @@ describe("userInteraction - clickAndRetry - disabled button (unhappy case)", fun
 
   it("Execution & Verification", async function () {
     const elem = await nonUi5.element.getById("Not-clickable", 10000);
-    await expect(nonUi5.userInteraction.clickAndRetry(elem, 1)).rejects.toThrow("Retries done. Failed to execute the function: ");
+    await expect(nonUi5.userInteraction.clickAndRetry(elem, 1)).rejects.toThrow(
+      "Function 'clickAndRetry' failed with: Retries done. Failed to execute the function: Timeout '0.001s' by waiting for element is enabled."
+    );
   });
 });
 
@@ -33,13 +35,15 @@ describe("userInteraction - clickAndRetry - empty value", function () {
   });
 
   it("Execution & Verification", async function () {
-    await expect(nonUi5.userInteraction.clickAndRetry()).rejects.toThrow("Function 'clickAndRetry' failed with: Please provide an element as first argument.");
+    await expect(nonUi5.userInteraction.clickAndRetry()).rejects.toThrow(
+      "Function 'clickAndRetry' failed with: Please provide an element as first argument."
+    );
   });
 });
 
 describe("userInteraction - clickAndRetry - field (make it active)", function () {
   let element;
-  
+
   it("Preparation", async function () {
     await common.navigation.navigateToUrl("http://localhost:34005/forms.html");
     element = await nonUi5.element.getById("ExampleValue1", 10000);

package/test/reuse/nonUi5/userInteraction/fillAndRetry.spec.js

@@ -33,6 +33,8 @@ describe("userInteraction - fillAndRetry - button (error case)", function () {
 
   it("Execution & Verification", async function () {
     const elem = await nonUi5.element.getById("Default", 10000);
-    await expect(nonUi5.userInteraction.fillAndRetry(elem, "New test value", 1)).rejects.toThrow("Retries done. Failed to execute the function:");
+    await expect(nonUi5.userInteraction.fillAndRetry(elem, "New test value", 1)).rejects.toThrow(
+      "Function 'retry' failed with: Retries done. Failed to execute the function"
+    );
   });
 });

package/test/reuse/ui5/assertion/expectAttributeToContain.spec.js

@@ -1,12 +1,14 @@
 "use strict";
 
 const selector = {
-  "elementProperties": {
-    "viewName": "sap.ui.demo.cart.view.Welcome",
-    "metadata": "sap.m.Title",
-    "text": [{
-      "path": "i18n>welcomeHeadline"
-    }]
+  elementProperties: {
+    viewName: "sap.ui.demo.cart.view.Welcome",
+    metadata: "sap.m.Title",
+    text: [
+      {
+        path: "i18n>welcomeHeadline"
+      }
+    ]
   }
 };
 
@@ -28,20 +30,24 @@ describe("assertion - expectAttributeToContain with wrong selector (unhappy case
   it("Execution & Verification", async function () {
     // Selector for a list of elements?
     const selectorWithATypo = {
-      "elementProperties": {
-        "viewName": "sap.ui.demo.cart.view.Welcome",
-        "metadata": "sap.m.Title",
-        "text": [{
-          "path": "i18n>welcomeHeadlineWithError" // "i18n>welcomeHeadlineWithError" instead of "i18n>welcomeHeadline"
-        }]
+      elementProperties: {
+        viewName: "sap.ui.demo.cart.view.Welcome",
+        metadata: "sap.m.Title",
+        text: [
+          {
+            path: "i18n>welcomeHeadlineWithError" // "i18n>welcomeHeadlineWithError" instead of "i18n>welcomeHeadline"
+          }
+        ]
       }
     };
-    await expect(ui5.assertion.expectAttributeToContain(selectorWithATypo, "text", "to the Shopping Cart", 0, 5000))
-      .rejects.toThrow(/uiControlExecuteLocator\(\): No visible elements found/);
+    await expect(ui5.assertion.expectAttributeToContain(selectorWithATypo, "text", "to the Shopping Cart", 0, 5000)).rejects.toThrow(
+      /uiControlExecuteLocator\(\): No visible elements found/
+    );
 
     // skip selector
-    await expect(ui5.assertion.expectAttributeToContain("text", "to the Shopping Cart", 0, 5000))
-      .rejects.toThrow("Function 'expectAttributeToContain' failed:");
+    await expect(ui5.assertion.expectAttributeToContain("text", "to the Shopping Cart", 0, 5000)).rejects.toThrow(
+      "Function 'expectAttributeToContain' failed with: Please provide a valid selector as argument."
+    );
   });
 });
 
@@ -55,14 +61,18 @@ describe("assertion - expectAttributeToContain with wrong attribute (unhappy cas
     // In Chrome: javascript error: done is not a function
     // In Firefox: TypeError: done is not a function
     // In Safari:  JavaScript exception occured: done is not a function. (In 'done(val)', 'done' is undefined)
-    await expect(ui5.assertion.expectAttributeToContain(selector, 123, "to the Shopping Cart", 0, 5000))
-      .rejects.toThrow("Function expectAttributeToContain failed: Please check your attribute argument.");
-    await expect(ui5.assertion.expectAttributeToContain(selector, false, "to the Shopping Cart", 0, 5000))
-      .rejects.toThrow("Function expectAttributeToContain failed: Please check your attribute argument.");
-    await expect(ui5.assertion.expectAttributeToContain(selector, null, "to the Shopping Cart", 0, 5000))
-      .rejects.toThrow("Function expectAttributeToContain failed: Please check your attribute argument.");
-    await expect(ui5.assertion.expectAttributeToContain(selector, undefined, "to the Shopping Cart", 0, 5000))
-      .rejects.toThrow("Function expectAttributeToContain failed: Please check your attribute argument.");
+    await expect(ui5.assertion.expectAttributeToContain(selector, 123, "to the Shopping Cart", 0, 5000)).rejects.toThrow(
+      "Function 'expectAttributeToContain' failed with: Please check your attribute argument."
+    );
+    await expect(ui5.assertion.expectAttributeToContain(selector, false, "to the Shopping Cart", 0, 5000)).rejects.toThrow(
+      "Function 'expectAttributeToContain' failed with: Please check your attribute argument."
+    );
+    await expect(ui5.assertion.expectAttributeToContain(selector, null, "to the Shopping Cart", 0, 5000)).rejects.toThrow(
+      "Function 'expectAttributeToContain' failed with: Please check your attribute argument."
+    );
+    await expect(ui5.assertion.expectAttributeToContain(selector, undefined, "to the Shopping Cart", 0, 5000)).rejects.toThrow(
+      "Function 'expectAttributeToContain' failed with: Please check your attribute argument."
+    );
   });
 });
 
@@ -72,7 +82,6 @@ describe("assertion - expectAttributeToContain with wrong compareValue (unhappy
   });
 
   it("Execution & Verification", async function () {
-    await expect(ui5.assertion.expectAttributeToContain(selector, "text", 123))
-      .rejects.toThrow("Welcome to the Shopping Cart");
+    await expect(ui5.assertion.expectAttributeToContain(selector, "text", 123)).rejects.toThrow("Welcome to the Shopping Cart");
   });
-});
+});

package/test/reuse/ui5/assertion/expectBindingContextPathToBe.spec.js

@@ -71,23 +71,22 @@ describe("assertion - expectBindingContextPathToBe with wrong selector (unhappy
     };
 
     await expect(ui5.assertion.expectBindingContextPathToBe(totallyWrongSelector, "/ProductCategories('AC')", 0, 2500))
-      .rejects.toThrow("Function 'expectBindingContextPathToBe' failed:Error: uiControlExecuteLocator(): No visible elements found with selector:");
-
+      .rejects.toThrow("Function 'expectBindingContextPathToBe' failed with: uiControlExecuteLocator(): No visible elements found with selector: {\"wrongData\":\"123\"} in 2.5s");
 
     await expect(ui5.assertion.expectBindingContextPathToBe(wrongSelector, "/ProductCategories('AC')", 0, 2500))
-      .rejects.toThrow("Function 'expectBindingContextPathToBe' failed:Error: uiControlExecuteLocator(): No visible elements found with selector:");
+      .rejects.toThrow("Function 'expectBindingContextPathToBe' failed with: uiControlExecuteLocator(): No visible elements found with selector:");
 
     await expect(ui5.assertion.expectBindingContextPathToBe(123, "/ProductCategories('AC')", 0, 2500))
-      .rejects.toThrow("Function 'expectBindingContextPathToBe' failed:Error: Function 'getDisplayed' failed: Please provide a valid selector as argument.");
+      .rejects.toThrow("Function 'expectBindingContextPathToBe' failed with: Please provide a valid selector as argument.");
 
     await expect(ui5.assertion.expectBindingContextPathToBe(false, "/ProductCategories('AC')", 0, 2500))
-      .rejects.toThrow("Function 'expectBindingContextPathToBe' failed:Error: Function 'getDisplayed' failed: Please provide a valid selector as argument.");
+      .rejects.toThrow("Function 'expectBindingContextPathToBe' failed with: Please provide a valid selector as argument.");
 
     await expect(ui5.assertion.expectBindingContextPathToBe(null, "/ProductCategories('AC')", 0, 2500))
-      .rejects.toThrow("Function 'expectBindingContextPathToBe' failed:Error: Function 'getDisplayed' failed: Please provide a valid selector as argument.");
+      .rejects.toThrow("Function 'expectBindingContextPathToBe' failed with: Please provide a valid selector as argument.");
 
     await expect(ui5.assertion.expectBindingContextPathToBe(undefined, "/ProductCategories('AC')", 0, 2500))
-      .rejects.toThrow("Function 'expectBindingContextPathToBe' failed:Error: Function 'getDisplayed' failed: Please provide a valid selector as argument.");
+      .rejects.toThrow("Function 'expectBindingContextPathToBe' failed with: Please provide a valid selector as argument.");
   });
 });