fix: remove 'parameters' in odata.ts (#345)

* fix: remove 'parameters' in odata.ts

* fix: update cookies consent handling to support new dialog structure

* fix: rename variable for clarity in cookies consent handling

* fix: change to .any as .race will be always be fulfilled despite if the promise is rejected

Author: Templada

src/reuse/modules/service/odata.ts

@@ -77,15 +77,6 @@ export class OData {
       error: console.error
     };
 
-    const parameters = {
-      ...{
-        "sap-client": "715",
-        "sap-documentation": ["heading", "quickinfo"],
-        "sap-language": "EN"
-      },
-      ...params
-    };
-
     const auth: any = {
       username,
       password
@@ -97,8 +88,8 @@ export class OData {
       logger: loggingEnabled ? logger : "",
       url,
       auth,
-      parameters, // Define initial request by $metadata?sap-client=<client-number>&sap-documentation=&sap-language=EN
-      strict: false // ignore non critical errors, e.g. orphaned annotations
+      params,
+      strict: false
     });
 
     await srv.init;

test/helper/utils.js

@@ -1,7 +1,7 @@
 exports.handleCookiesConsent = async function handleCookiesConsent() {
   // eslint-disable-next-line no-undef
   await util.function.executeOptional(async function () {
-    const selector = {
+    const oldCookiesConsentDialog = {
       "elementProperties": {
         "viewName": "sap.ui.documentation.sdk.view.App",
         "metadata": "sap.m.Button",
@@ -10,6 +10,10 @@ exports.handleCookiesConsent = async function handleCookiesConsent() {
         }]
       }
     };
-    await ui5.userInteraction.click(selector, 0, 15000);
+    const newCookiesConsentDialog = "button[id='truste-consent-button']";
+    await Promise.any([
+      ui5.userInteraction.click(oldCookiesConsentDialog, 0, 15000),
+      nonUi5.userInteraction.click(newCookiesConsentDialog, 0, 15000)
+    ]);
   }, []);
 };

test/reuse/nonUi5/userInteraction/clickElementInSvg.spec.js

@@ -7,6 +7,7 @@ describe("userInteraction - clickElementInSvg - UI5 SVG Chart", function () {
   it("Preparation", async function () {
     await common.navigation.navigateToUrl("https://sapui5.hana.ondemand.com/#/entity/sap.suite.ui.commons.ChartContainer/sample/sap.suite.ui.commons.sample.ChartContainerToolbarEnhancement");
     await handleCookiesConsent();
+    await util.browser.sleep(5000);
   });
 
   it("Execution", async function () {