test: Fixing e2e regression tests (#1765) (#1783) (#1821)

Author: Gilberto Alvarado

ci-scripts/e2e-cypress.sh

@@ -2,6 +2,8 @@
 set -e
 set -o pipefail
 
+SUITE=$1
+
 yarn
 (cd projects/storefrontapp-e2e-cypress && yarn)
 
@@ -10,5 +12,10 @@ echo 'Building Spartacus libraries'
 yarn build:core:lib
 
 echo '-----'
-echo 'Running Cypress end to end tests'
-yarn e2e:cy:start-run-ci
+echo "Running Cypress end to end tests $SUITE"
+if [ $SUITE == 'regression' ]; then
+    yarn e2e:cy:start-run-regression-ci
+    yarn e2e:cy:start-run-mobile-ci
+else
+    yarn e2e:cy:start-run-ci
+fi

package.json

@@ -15,11 +15,15 @@
     "e2e:cy:open": "yarn --cwd ./projects/storefrontapp-e2e-cypress run cy:open",
     "e2e:cy:run": "yarn --cwd ./projects/storefrontapp-e2e-cypress run cy:run",
     "e2e:cy:run:ci": "yarn --cwd ./projects/storefrontapp-e2e-cypress run cy:run --record --key $CYPRESS_KEY",
+    "e2e:cy:run:mobile": "yarn --cwd ./projects/storefrontapp-e2e-cypress run cy:run:mobile",
+    "e2e:cy:run:mobile:ci": "yarn --cwd ./projects/storefrontapp-e2e-cypress run cy:run:mobile --record --key $CYPRESS_KEY",
     "e2e:cy:run:regression": "yarn --cwd ./projects/storefrontapp-e2e-cypress run cy:run:regression",
     "e2e:cy:run:regression:ci": "yarn --cwd ./projects/storefrontapp-e2e-cypress run cy:run:regression --record --key $CYPRESS_KEY",
     "e2e:cy:start-open": "start-server-and-test start:ci http-get://localhost:4200 e2e:cy:open",
     "e2e:cy:start-run": "start-server-and-test start:ci http-get://localhost:4200 e2e:cy:run",
     "e2e:cy:start-run-ci": "start-server-and-test start:ci http-get://localhost:4200 e2e:cy:run:ci",
+    "e2e:cy:start-run-mobile": "start-server-and-test start:ci http-get://localhost:4200 e2e:cy:run:mobile",
+    "e2e:cy:start-run-mobile-ci": "start-server-and-test start:ci http-get://localhost:4200 e2e:cy:run:mobile:ci",
     "e2e:cy:start-run-regression": "start-server-and-test start:ci http-get://localhost:4200 e2e:cy:run:regression",
     "e2e:cy:start-run-regression-ci": "start-server-and-test start:ci http-get://localhost:4200 e2e:cy:run:regression:ci",
     "generate:changelog": "ts-node ./scripts/changelog.ts",

projects/storefrontapp-e2e-cypress/cypress.json

@@ -2,6 +2,7 @@
   "defaultCommandTimeout": 10000,
   "baseUrl": "http://localhost:4200",
   "projectId": "k3nmep",
+  "requestTimeout": 10000,
   "env": {
     "CLIENT_ID": "mobile_android",
     "CLIENT_SECRET": "secret",

projects/storefrontapp-e2e-cypress/cypress/helpers/checkout-as-persistent-user.ts

@@ -4,37 +4,6 @@ export function loginSuccessfully() {
   cy.get('.cx-login-greet').should('contain', 'Test User');
 }
 
-export function addShippingAddress() {
-  cy.request({
-    method: 'POST',
-    url: `${Cypress.env(
-      'API_URL'
-    )}/rest/v2/electronics-spa/users/test-user-cypress@ydev.hybris.com/addresses?lang=en&curr=USD`,
-    headers: {
-      Authorization: `bearer ${
-        JSON.parse(sessionStorage.getItem('auth')).userToken.token[
-          'access_token'
-        ]
-      }`,
-    },
-    body: {
-      defaultAddress: false,
-      titleCode: 'mr',
-      firstName: 'Test',
-      lastName: 'User',
-      line1: '999 de Maisonneuve',
-      line2: '',
-      town: 'Montreal',
-      region: { isocode: 'US-AK' },
-      country: { isocode: 'US' },
-      postalCode: 'H4B3L4',
-      phone: '',
-    },
-  }).then(response => {
-    expect(response.status).to.eq(201);
-  });
-}
-
 export function changePageFromProductToCategory() {
   // click big banner
   cy.get('.Section1 cx-responsive-banner')
@@ -163,24 +132,3 @@ export function displaySummaryPage() {
   cy.get('cx-cart-item .cx-code').should('contain', product.code);
   cy.get('cx-order-summary .cx-summary-amount').should('not.be.empty');
 }
-
-export function deleteShippingAddress() {
-  cy.visit('/my-account/address-book');
-  cy.getByText('delete')
-    .first()
-    .click();
-  cy.get('.cx-address-card--delete-mode button.btn-primary').click();
-  cy.get('cx-global-message').contains('Address deleted successfully!');
-}
-
-export function deletePaymentMethod() {
-  cy.visit('/my-account/payment-details');
-  cy.getByText('Delete')
-    .first()
-    .click();
-  cy.get('.btn-primary').should('contain', 'delete');
-  cy.get('.btn-primary').click();
-  cy.get('.cx-payment .cx-body').then(() => {
-    cy.get('cx-card').should('not.exist');
-  });
-}

projects/storefrontapp-e2e-cypress/cypress/helpers/product-search-pricing-flow.ts

@@ -1,6 +1,13 @@
 import { PRODUCT_LISTING } from './data-configuration';
 
 export function productPricingFlow() {
+  cy.server();
+  cy.route('GET', '/rest/v2/electronics-spa/products/search*').as('query');
+  cy.route(
+    'GET',
+    '/rest/v2/electronics-spa/products/search?fields=*&sort=price-asc*'
+  ).as('query_price_asc');
+
   // Click on a Category
   cy.get('header').within(() => {
     cy.get('.nav-link')
@@ -23,26 +30,29 @@ export function productPricingFlow() {
 
   cy.get('cx-product-list-item')
     .first()
-    .should('contain', 'DSC-S930');
+    .should('contain', 'DSC-WX1');
 
   // Navigate to next page
   cy.get('.page-item:last-of-type .page-link:first').click();
   cy.get('.page-item.active > .page-link').should('contain', '2');
 
+  cy.wait('@query');
+
   cy.get('cx-product-list-item:nth-child(1)').should(
     'contain',
-    'Cyber-shot W55'
+    'PowerShot A480'
   );
 
   // Sort by price low to high
   cy.get('cx-sorting .ng-select:first').ngSelect(
     PRODUCT_LISTING.SORTING_TYPES.BY_PRICE_ASC
   );
-  cy.get('.page-item.active > .page-link').should('contain', '2');
-  cy.get('cx-product-list-item').should('contain', 'DSC-W180');
 
-  // Add product to cart from search listing page
-  cy.get('cx-add-to-cart:first button').click({ force: true });
-  cy.get('.cx-dialog-header .close').click();
-  cy.get('cx-mini-cart .count').should('contain', '1');
+  cy.wait('@query_price_asc');
+
+  cy.get('.page-item.active > .page-link').should('contain', '2');
+  cy.get('cx-product-list-item:first .cx-product-name').should(
+    'contain',
+    'DSC-W180'
+  );
 }