@commercetools-frontend/cypress 24.5.0 → 24.7.0

package/add-commands/dist/commercetools-frontend-cypress-add-commands.cjs.dev.js

@@ -49,7 +49,11 @@ function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var _
 
 const defaultTimeouts = {
   waitForEmailInput: 4000,
-  waitForPasswordInput: 8000
+  waitForPasswordInput: 8000,
+  waitForElement: 15000,
+  waitForUrl: 15000,
+  waitForRedirect: 3000,
+  waitForIdentityRedirect: 8000
 };
 function isFeatureSupported(expectedVersion) {
   return semver__default["default"].gte(Cypress.version, expectedVersion);
@@ -209,8 +213,14 @@ function loginByForm(commandOptions) {
             });
 
             // Wait for the flow to redirect back to the application.
-            cy.get('[role="main"]').should('exist');
-            cy.url().should('include', url);
+            // eslint-disable-next-line cypress/no-unnecessary-waiting
+            cy.wait(commandOptions.timeouts?.waitForRedirect ?? defaultTimeouts.waitForRedirect);
+            cy.get('[role="main"]', {
+              timeout: commandOptions.timeouts?.waitForElement ?? defaultTimeouts.waitForElement
+            }).should('exist');
+            cy.url({
+              timeout: commandOptions.timeouts?.waitForUrl ?? defaultTimeouts.waitForUrl
+            }).should('include', url);
           } else {
             const mcUrl = appConfig.mcApiUrl.replace('mc-api', 'mc');
             // See similar comment above regarding the usage of `cy.wait`.
@@ -269,7 +279,12 @@ function loginByForm(commandOptions) {
           }
         } else {
           if (isGlobalIdentityEnabled) {
-            cy.url().should('include', `${identityUrl}/login`);
+            // Wait for redirect to Identity to complete
+            // eslint-disable-next-line cypress/no-unnecessary-waiting
+            cy.wait(commandOptions.timeouts?.waitForIdentityRedirect ?? defaultTimeouts.waitForIdentityRedirect);
+            cy.url({
+              timeout: commandOptions.timeouts?.waitForUrl ?? defaultTimeouts.waitForUrl
+            }).should('include', `${identityUrl}/login`);
             // Fill in the email and click Next
             cy.get('input[name="identifier"]', {
               timeout: commandOptions.timeouts?.waitForEmailInput ?? defaultTimeouts.waitForEmailInput
@@ -284,17 +299,32 @@ function loginByForm(commandOptions) {
             cy.get('input[name="password"]').type(userCredentials.password, {
               log: false
             });
-            cy.get('button').contains('Submit').click();
+            cy.get('button').contains('Submit').click({
+              force: true
+            });
+
+            // Wait for redirect to start
+            // eslint-disable-next-line cypress/no-unnecessary-waiting
+            cy.wait(commandOptions.timeouts?.waitForRedirect ?? defaultTimeouts.waitForRedirect);
 
             // Wait for the flow to redirect back to the application.
             cy.origin(Cypress.config('baseUrl'), {
               args: {
-                url
+                url,
+                timeouts: commandOptions.timeouts,
+                defaultTimeouts
               }
             }, _ref3 => {
-              let url = _ref3.url;
-              cy.get('[role="main"]').should('exist');
-              cy.url().should('include', url);
+              let url = _ref3.url,
+                timeouts = _ref3.timeouts,
+                defaultTimeouts = _ref3.defaultTimeouts;
+              // Wait for application to fully load
+              cy.get('[role="main"]', {
+                timeout: timeouts?.waitForElement ?? defaultTimeouts.waitForElement
+              }).should('exist');
+              cy.url({
+                timeout: timeouts?.waitForUrl ?? defaultTimeouts.waitForUrl
+              }).should('include', url);
             });
           } else {
             // Legacy login flow.
@@ -320,7 +350,9 @@ function loginByForm(commandOptions) {
     }
     if (commandOptions.initialRoute) {
       cy.visit(`${Cypress.config('baseUrl')}${commandOptions.initialRoute}`);
-      cy.url().should('include', commandOptions.initialRoute);
+      cy.url({
+        timeout: commandOptions.timeouts?.waitForUrl ?? defaultTimeouts.waitForUrl
+      }).should('include', commandOptions.initialRoute);
     }
   });
 }

package/add-commands/dist/commercetools-frontend-cypress-add-commands.cjs.prod.js

@@ -49,7 +49,11 @@ function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var _
 
 const defaultTimeouts = {
   waitForEmailInput: 4000,
-  waitForPasswordInput: 8000
+  waitForPasswordInput: 8000,
+  waitForElement: 15000,
+  waitForUrl: 15000,
+  waitForRedirect: 3000,
+  waitForIdentityRedirect: 8000
 };
 function isFeatureSupported(expectedVersion) {
   return semver__default["default"].gte(Cypress.version, expectedVersion);
@@ -209,8 +213,14 @@ function loginByForm(commandOptions) {
             });
 
             // Wait for the flow to redirect back to the application.
-            cy.get('[role="main"]').should('exist');
-            cy.url().should('include', url);
+            // eslint-disable-next-line cypress/no-unnecessary-waiting
+            cy.wait(commandOptions.timeouts?.waitForRedirect ?? defaultTimeouts.waitForRedirect);
+            cy.get('[role="main"]', {
+              timeout: commandOptions.timeouts?.waitForElement ?? defaultTimeouts.waitForElement
+            }).should('exist');
+            cy.url({
+              timeout: commandOptions.timeouts?.waitForUrl ?? defaultTimeouts.waitForUrl
+            }).should('include', url);
           } else {
             const mcUrl = appConfig.mcApiUrl.replace('mc-api', 'mc');
             // See similar comment above regarding the usage of `cy.wait`.
@@ -269,7 +279,12 @@ function loginByForm(commandOptions) {
           }
         } else {
           if (isGlobalIdentityEnabled) {
-            cy.url().should('include', `${identityUrl}/login`);
+            // Wait for redirect to Identity to complete
+            // eslint-disable-next-line cypress/no-unnecessary-waiting
+            cy.wait(commandOptions.timeouts?.waitForIdentityRedirect ?? defaultTimeouts.waitForIdentityRedirect);
+            cy.url({
+              timeout: commandOptions.timeouts?.waitForUrl ?? defaultTimeouts.waitForUrl
+            }).should('include', `${identityUrl}/login`);
             // Fill in the email and click Next
             cy.get('input[name="identifier"]', {
               timeout: commandOptions.timeouts?.waitForEmailInput ?? defaultTimeouts.waitForEmailInput
@@ -284,17 +299,32 @@ function loginByForm(commandOptions) {
             cy.get('input[name="password"]').type(userCredentials.password, {
               log: false
             });
-            cy.get('button').contains('Submit').click();
+            cy.get('button').contains('Submit').click({
+              force: true
+            });
+
+            // Wait for redirect to start
+            // eslint-disable-next-line cypress/no-unnecessary-waiting
+            cy.wait(commandOptions.timeouts?.waitForRedirect ?? defaultTimeouts.waitForRedirect);
 
             // Wait for the flow to redirect back to the application.
             cy.origin(Cypress.config('baseUrl'), {
               args: {
-                url
+                url,
+                timeouts: commandOptions.timeouts,
+                defaultTimeouts
               }
             }, _ref3 => {
-              let url = _ref3.url;
-              cy.get('[role="main"]').should('exist');
-              cy.url().should('include', url);
+              let url = _ref3.url,
+                timeouts = _ref3.timeouts,
+                defaultTimeouts = _ref3.defaultTimeouts;
+              // Wait for application to fully load
+              cy.get('[role="main"]', {
+                timeout: timeouts?.waitForElement ?? defaultTimeouts.waitForElement
+              }).should('exist');
+              cy.url({
+                timeout: timeouts?.waitForUrl ?? defaultTimeouts.waitForUrl
+              }).should('include', url);
             });
           } else {
             // Legacy login flow.
@@ -320,7 +350,9 @@ function loginByForm(commandOptions) {
     }
     if (commandOptions.initialRoute) {
       cy.visit(`${Cypress.config('baseUrl')}${commandOptions.initialRoute}`);
-      cy.url().should('include', commandOptions.initialRoute);
+      cy.url({
+        timeout: commandOptions.timeouts?.waitForUrl ?? defaultTimeouts.waitForUrl
+      }).should('include', commandOptions.initialRoute);
     }
   });
 }

package/add-commands/dist/commercetools-frontend-cypress-add-commands.esm.js

@@ -29,7 +29,11 @@ function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var _
 
 const defaultTimeouts = {
   waitForEmailInput: 4000,
-  waitForPasswordInput: 8000
+  waitForPasswordInput: 8000,
+  waitForElement: 15000,
+  waitForUrl: 15000,
+  waitForRedirect: 3000,
+  waitForIdentityRedirect: 8000
 };
 function isFeatureSupported(expectedVersion) {
   return semver.gte(Cypress.version, expectedVersion);
@@ -189,8 +193,14 @@ function loginByForm(commandOptions) {
             });
 
             // Wait for the flow to redirect back to the application.
-            cy.get('[role="main"]').should('exist');
-            cy.url().should('include', url);
+            // eslint-disable-next-line cypress/no-unnecessary-waiting
+            cy.wait(commandOptions.timeouts?.waitForRedirect ?? defaultTimeouts.waitForRedirect);
+            cy.get('[role="main"]', {
+              timeout: commandOptions.timeouts?.waitForElement ?? defaultTimeouts.waitForElement
+            }).should('exist');
+            cy.url({
+              timeout: commandOptions.timeouts?.waitForUrl ?? defaultTimeouts.waitForUrl
+            }).should('include', url);
           } else {
             const mcUrl = appConfig.mcApiUrl.replace('mc-api', 'mc');
             // See similar comment above regarding the usage of `cy.wait`.
@@ -249,7 +259,12 @@ function loginByForm(commandOptions) {
           }
         } else {
           if (isGlobalIdentityEnabled) {
-            cy.url().should('include', `${identityUrl}/login`);
+            // Wait for redirect to Identity to complete
+            // eslint-disable-next-line cypress/no-unnecessary-waiting
+            cy.wait(commandOptions.timeouts?.waitForIdentityRedirect ?? defaultTimeouts.waitForIdentityRedirect);
+            cy.url({
+              timeout: commandOptions.timeouts?.waitForUrl ?? defaultTimeouts.waitForUrl
+            }).should('include', `${identityUrl}/login`);
             // Fill in the email and click Next
             cy.get('input[name="identifier"]', {
               timeout: commandOptions.timeouts?.waitForEmailInput ?? defaultTimeouts.waitForEmailInput
@@ -264,17 +279,32 @@ function loginByForm(commandOptions) {
             cy.get('input[name="password"]').type(userCredentials.password, {
               log: false
             });
-            cy.get('button').contains('Submit').click();
+            cy.get('button').contains('Submit').click({
+              force: true
+            });
+
+            // Wait for redirect to start
+            // eslint-disable-next-line cypress/no-unnecessary-waiting
+            cy.wait(commandOptions.timeouts?.waitForRedirect ?? defaultTimeouts.waitForRedirect);
 
             // Wait for the flow to redirect back to the application.
             cy.origin(Cypress.config('baseUrl'), {
               args: {
-                url
+                url,
+                timeouts: commandOptions.timeouts,
+                defaultTimeouts
               }
             }, _ref3 => {
-              let url = _ref3.url;
-              cy.get('[role="main"]').should('exist');
-              cy.url().should('include', url);
+              let url = _ref3.url,
+                timeouts = _ref3.timeouts,
+                defaultTimeouts = _ref3.defaultTimeouts;
+              // Wait for application to fully load
+              cy.get('[role="main"]', {
+                timeout: timeouts?.waitForElement ?? defaultTimeouts.waitForElement
+              }).should('exist');
+              cy.url({
+                timeout: timeouts?.waitForUrl ?? defaultTimeouts.waitForUrl
+              }).should('include', url);
             });
           } else {
             // Legacy login flow.
@@ -300,7 +330,9 @@ function loginByForm(commandOptions) {
     }
     if (commandOptions.initialRoute) {
       cy.visit(`${Cypress.config('baseUrl')}${commandOptions.initialRoute}`);
-      cy.url().should('include', commandOptions.initialRoute);
+      cy.url({
+        timeout: commandOptions.timeouts?.waitForUrl ?? defaultTimeouts.waitForUrl
+      }).should('include', commandOptions.initialRoute);
     }
   });
 }

package/dist/commercetools-frontend-cypress.cjs.dev.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var constants = require('./constants-009cb682.cjs.dev.js');
 
 // NOTE: This string will be replaced on build time with the package version.
-var version = "24.5.0";
+var version = "24.7.0";
 
 exports.HTTP_STATUS_CODES = constants.HTTP_STATUS_CODES;
 exports.OIDC_RESPONSE_TYPES = constants.OIDC_RESPONSE_TYPES;

package/dist/commercetools-frontend-cypress.cjs.prod.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var constants = require('./constants-2f1475a6.cjs.prod.js');
 
 // NOTE: This string will be replaced on build time with the package version.
-var version = "24.5.0";
+var version = "24.7.0";
 
 exports.HTTP_STATUS_CODES = constants.HTTP_STATUS_CODES;
 exports.OIDC_RESPONSE_TYPES = constants.OIDC_RESPONSE_TYPES;

package/dist/commercetools-frontend-cypress.esm.js

@@ -1,6 +1,6 @@
 export { H as HTTP_STATUS_CODES, O as OIDC_RESPONSE_TYPES, S as STORAGE_KEYS } from './constants-13c76918.esm.js';
 
 // NOTE: This string will be replaced on build time with the package version.
-var version = "24.5.0";
+var version = "24.7.0";
 
 export { version };

package/dist/declarations/src/add-commands/login.d.ts

@@ -21,6 +21,26 @@ export type LoginCommandTimeouts = {
      * Defaults to `8000` (8 seconds).
      */
     waitForPasswordInput?: number;
+    /**
+     * The timeout in milliseconds for cy.get() operations on elements.
+     * Defaults to `15000` (15 seconds).
+     */
+    waitForElement?: number;
+    /**
+     * The timeout in milliseconds for cy.url() operations.
+     * Defaults to `15000` (15 seconds).
+     */
+    waitForUrl?: number;
+    /**
+     * The number of milliseconds to wait for redirects to complete.
+     * Defaults to `3000` (3 seconds).
+     */
+    waitForRedirect?: number;
+    /**
+     * The number of milliseconds to wait for Identity redirect to complete.
+     * Defaults to `8000` (8 seconds).
+     */
+    waitForIdentityRedirect?: number;
 };
 export type CommandLoginOptions = {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commercetools-frontend/cypress",
-  "version": "24.5.0",
+  "version": "24.7.0",
   "description": "Cypress commands and utilities for Custom Applications",
   "bugs": "https://github.com/commercetools/merchant-center-application-kit/issues",
   "repository": {
@@ -41,9 +41,9 @@
   "dependencies": {
     "@babel/runtime": "^7.22.15",
     "@babel/runtime-corejs3": "^7.22.15",
-    "@commercetools-frontend/application-config": "24.5.0",
-    "@commercetools-frontend/application-shell": "24.5.0",
-    "@commercetools-frontend/constants": "24.5.0",
+    "@commercetools-frontend/application-config": "24.7.0",
+    "@commercetools-frontend/application-shell": "24.7.0",
+    "@commercetools-frontend/constants": "24.7.0",
     "@manypkg/get-packages": "1.1.3",
     "@types/semver": "^7.5.1",
     "semver": "7.6.2",