@sap_oss/wdio-qmate-service - npm Package Compare versions

Comparing version 2.9.6 to 2.9.7

lib/reuse/modules/ui5/navigation.js

@@ -36,4 +36,4 @@ "use strict";
         // Check if intent has query params and extract them from the intent
-        queryParams = queryParams.concat(this._extractQueryParams(intent));
-        // Check if baseUrl has query params and extract them from the baseUrl
+        const intentQueryParams = this._extractQueryParams(intent);
+        // Check if baseUrl has query params, extract them from the baseUrl and merge them with the existing params
         queryParams = queryParams.concat(this._extractQueryParams(browser.config.baseUrl));
@@ -44,7 +44,12 @@ // Add prevent popup url params if not already present
         }
-        // Construct the url with the intent and query params
+        // Construct the url params
         let constructedParams = this._constructUrlParams(queryParams);
         if (constructedParams !== "")
             constructedParams = `?${constructedParams}`;
-        const urlWithParams = `${baseUrlNormalized}${constructedParams}#${intentNormalized}`;
+        // Construct the intent params
+        let constructedIntentParams = this._constructUrlParams(intentQueryParams);
+        if (constructedIntentParams !== "")
+            constructedIntentParams = `?${constructedIntentParams}`;
+        // Construct the final url
+        const urlWithParams = `${baseUrlNormalized}${constructedParams}#${intentNormalized}${constructedIntentParams}`;
         vl.log(`Url with params: ${urlWithParams}`);
@@ -51,0 +56,0 @@ try {

package.json

 {
   "name": "@sap_oss/wdio-qmate-service",
-  "version": "2.9.6",
+  "version": "2.9.7",
   "author": "SAP SE",
@@ -5,0 +5,0 @@ "types": "./@types/index.d.ts",

test/reuse/ui5/navigation/navigateToApplication.spec.js

@@ -13,3 +13,4 @@ "use strict";
 const INTENT = "Shell-home";
-const DUMMY_QUERY_PARAM = "dummyQueryParam=dummyValue";
+const DUMMY_QUERY_PARAM_1 = "dummyQueryParam1=dummyValue1";
+const DUMMY_QUERY_PARAM_2 = "dummyQueryParam2=dummyValue2";
 const PREVENT_POPUP_QUERY_PARAMS = "help-readCatalog=false&help-stateUACP=PRODUCTION";
@@ -64,3 +65,3 @@
   it("Preparation", async function () {
-    browser.config.baseUrl = `${BASE_URL}?${DUMMY_QUERY_PARAM}`;
+    browser.config.baseUrl = `${BASE_URL}?${DUMMY_QUERY_PARAM_1}`;
   });
@@ -73,3 +74,3 @@
   it("Verification", async function () {
-    const urlExp = `${BASE_URL}?${DUMMY_QUERY_PARAM}#Shell-home`;
+    const urlExp = `${BASE_URL}?${DUMMY_QUERY_PARAM_1}#Shell-home`;
     await common.assertion.expectUrlToBe(urlExp);
@@ -79,4 +80,19 @@ });
 
-describe("navigation - navigateToApplication - intent with dummy query parameters", function () {
+describe("navigation - navigateToApplication - intent and baseUrl with query parameters", function () {
   it("Preparation", async function () {
+    browser.config.baseUrl = `${BASE_URL}?${DUMMY_QUERY_PARAM_1}`;
+  });
+
+  it("Execution", async function () {
+    await ui5.navigation.navigateToApplication(`${INTENT}?${DUMMY_QUERY_PARAM_2}`, false);
+  });
+
+  it("Verification", async function () {
+    const urlExp = `${BASE_URL}?${DUMMY_QUERY_PARAM_1}#Shell-home?${DUMMY_QUERY_PARAM_2}`;
+    await common.assertion.expectUrlToBe(urlExp);
+  });
+});
+
+describe("navigation - navigateToApplication - intent with multiple query parameters", function () {
+  it("Preparation", async function () {
     browser.config.baseUrl = BASE_URL;
@@ -86,7 +102,7 @@ });
   it("Execution", async function () {
-    await ui5.navigation.navigateToApplication(`${INTENT}?${DUMMY_QUERY_PARAM}`, false);
+    await ui5.navigation.navigateToApplication(`${INTENT}?${DUMMY_QUERY_PARAM_1}&${DUMMY_QUERY_PARAM_2}`, false);
   });
 
   it("Verification", async function () {
-    const urlExp = `${BASE_URL}?${DUMMY_QUERY_PARAM}#Shell-home`;
+    const urlExp = `${BASE_URL}#Shell-home?${DUMMY_QUERY_PARAM_1}&${DUMMY_QUERY_PARAM_2}`;
     await common.assertion.expectUrlToBe(urlExp);
@@ -98,3 +114,3 @@ });
   it("Preparation", async function () {
-    browser.config.baseUrl = `${BASE_URL}?${DUMMY_QUERY_PARAM}&${PREVENT_POPUP_QUERY_PARAMS}`;
+    browser.config.baseUrl = `${BASE_URL}?${DUMMY_QUERY_PARAM_1}&${PREVENT_POPUP_QUERY_PARAMS}`;
   });
@@ -107,3 +123,3 @@
   it("Verification", async function () {
-    const urlExp = `${BASE_URL}?${DUMMY_QUERY_PARAM}&${PREVENT_POPUP_QUERY_PARAMS}#Shell-home`;
+    const urlExp = `${BASE_URL}?${DUMMY_QUERY_PARAM_1}&${PREVENT_POPUP_QUERY_PARAMS}#Shell-home`;
     await common.assertion.expectUrlToBe(urlExp);
@@ -110,0 +126,0 @@ });

No alert changes

Improved metrics

Total package byte prevSize

2621041

increased by0.04%

Lines of code

36657

increased by0.05%

Worsened metrics

Number of downloads

412

decreased by-50.3%

Published versions last year

21

decreased by-4.55%

No dependency changes