chore: Test JDK21 Switch - GC Flash

.env-cmdrc

@@ -1,6 +1,6 @@
 {
   "dev": {
-    "CX_BASE_URL": "https://40.76.109.9:9002"
+    "CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-p4-public.model-t.myhybris.cloud"
   },
   "s1": {
     "CX_BASE_URL": "https://api.c432wmya2v-teamspart3-s1-public.model-t.myhybris.cloud"
@@ -12,7 +12,7 @@
     "CX_BASE_URL": "http://localhost:9002"
   },
   "ci": {
-    "CX_BASE_URL": "https://20.83.184.244:9002"
+    "CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-p4-public.model-t.myhybris.cloud"
   },
   "ccv2": {
     "CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-p1-public.model-t.myhybris.cloud"

projects/ssr-tests/src/utils/proxy.utils.ts

@@ -14,7 +14,7 @@ import { gunzipSync, inflateSync } from 'zlib';
  *
  * This is needed to set up a custom HTTPS agent with the correct SNI servername.
  */
-const IS_CCV2_SERVER = false;
+const IS_CCV2_SERVER = true;
 /**
  * Options to start a proxy server.
  */

projects/storefrontapp-e2e-cypress/cypress.config.ci.ts

@@ -6,7 +6,7 @@
 
 import { defineConfig } from 'cypress';
 
-const JDK_VERSION: string = 'JDK17';
+const JDK_VERSION: string = 'JDK21';
 const CLIENT_ID =
   JDK_VERSION === 'JDK21' ? 'mobile_android_public' : 'mobile_android';
 
@@ -16,8 +16,8 @@ const API_URL =
     : 'https://20.83.184.244:9002';
 
 export default defineConfig({
-  defaultCommandTimeout: 30000,
-  requestTimeout: 30000,
+  defaultCommandTimeout: 120000,
+  requestTimeout: 120000,
   projectId: 'k3nmep',
   numTestsKeptInMemory: 100,
   chromeWebSecurity: false,

projects/storefrontapp-e2e-cypress/cypress.config.ts

@@ -6,7 +6,7 @@
 
 import { defineConfig } from 'cypress';
 
-const JDK_VERSION: string = 'JDK17';
+const JDK_VERSION: string = 'JDK21';
 const CLIENT_ID =
   JDK_VERSION === 'JDK21' ? 'mobile_android_public' : 'mobile_android';
 

projects/storefrontapp-e2e-cypress/cypress/e2e/a11y/b2c/checkout.a11y-e2e.cy.ts

@@ -19,7 +19,7 @@ describe('Checkout Accessibility', { testIsolation: false }, () => {
   before(() => {
     cy.a11yContinuumSetup();
   });
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext([/*'mobile',*/ 'desktop'], () => {
     before(() => {
       cy.window().then((win) => {
         win.sessionStorage.clear();

projects/storefrontapp-e2e-cypress/cypress/e2e/b2b/regression/user-registration/b2b-user-registration.core-e2e.cy.ts

@@ -17,7 +17,7 @@ import { isolateTests } from '../../../../support/utils/test-isolation';
 import { getSampleUser } from './../../../../sample-data/checkout-flow';
 
 context('B2B - User Registration', { testIsolation: false }, () => {
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext([/*'mobile',*/ 'desktop'], () => {
     isolateTests();
     beforeEach(() => {
       clearAllStorage();

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/anonymous-consents/anonymous-consents-flow.e2e.cy.ts

@@ -13,7 +13,7 @@ import {
 import { viewportContext } from '../../../helpers/viewport-context';
 
 context('Anonymous consents flow', () => {
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     beforeEach(() => {
       cy.window().then((win) => {
         win.sessionStorage.clear();
@@ -25,7 +25,7 @@ context('Anonymous consents flow', () => {
     });
   });
 
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     beforeEach(() => {
       cy.window().then((win) => {
         win.sessionStorage.clear();

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/cart/added-to-cart-modal.e2e.cy.ts

@@ -13,7 +13,7 @@ const productId2 = '2006139';
 const productName2 = 'M340';
 
 describe('Added to cart modal - Anonymous user', () => {
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     before(() => {
       cy.window().then((win) => {
         win.sessionStorage.clear();

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/cart/cart-validation.e2e.cy.ts

@@ -44,7 +44,7 @@ context('Cart validation', () => {
     });
   });
 
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     beforeEach(() => {
       clearAllStorage();
       cy.cxConfig({

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/cart/cart.e2e.cy.ts

@@ -12,7 +12,7 @@ import { viewportContext } from '../../../helpers/viewport-context';
 import { login } from '../../../support/utils/login';
 
 describe('Cart', () => {
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     context('Anonymous user', () => {
       it('should add and remove products', () => {
         cart.checkBasicCart();

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/cart/saved-cart.core-e2e.cy.ts

@@ -12,7 +12,7 @@ import * as sampleData from '../../../sample-data/saved-cart';
 import { clearAllStorage } from '../../../support/utils/clear-all-storage';
 
 describe('Saved Cart', () => {
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     describe('Cart page', () => {
       describe('Anonymous user', () => {
         beforeEach(() => {

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/checkout/checkout-as-guest.e2e.cy.ts

@@ -14,7 +14,7 @@ import { viewportContext } from '../../../helpers/viewport-context';
 import { cheapProduct } from '../../../sample-data/checkout-flow';
 import { isolateTests } from '../../../support/utils/test-isolation';
 context('Checkout as guest', { testIsolation: false }, () => {
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     isolateTests();
     before(() => {
       cy.window().then((win) => win.sessionStorage.clear());

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/my-account/address-book.e2e.cy.ts

@@ -32,7 +32,7 @@ describe('My Account - Address Book', { testIsolation: false }, () => {
 });
 
 describe('My Account - Address Book', { testIsolation: false }, () => {
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     isolateTests();
     before(() => {
       cy.window().then((win) => win.sessionStorage.clear());

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/my-account/close-account.e2e.cy.ts

@@ -17,7 +17,7 @@ import { isolateTests } from '../../../support/utils/test-isolation';
 const CLOSE_ACCOUNT_URL = '/my-account/close-account';
 
 describe('My Account - Close Account', () => {
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     before(() =>
       cy.window().then((win) => {
         win.sessionStorage.clear();

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/my-account/consent-management.e2e.cy.ts

@@ -12,7 +12,7 @@ import * as login from '../../../helpers/login';
 import { viewportContext } from '../../../helpers/viewport-context';
 import { isolateTests } from '../../../support/utils/test-isolation';
 
-viewportContext(['mobile', 'desktop'], () => {
+viewportContext(['mobile' /*, 'desktop'*/], () => {
   describe('My Account - Consent Management', () => {
     before(() => {
       cy.window().then((win) => win.sessionStorage.clear());

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/my-account/my-account-v2-consent-management.e2e.cy.ts

@@ -15,7 +15,7 @@ import { standardUser } from '../../../sample-data/shared-users';
 import { isolateTests } from '../../../support/utils/test-isolation';
 
 describe('My Account - Consent Management(CXSPA-10780)', () => {
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     before(() => {
       cy.window().then((win) => win.sessionStorage.clear());
     });

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/my-account/my-account-v2-email.e2e.cy.ts

@@ -14,7 +14,7 @@ import { isolateTests } from '../../../support/utils/test-isolation';
 export const UPDATE_EMAIL_URL = '/my-account/update-email';
 
 describe('My Account - Update Email (CXSPA-10780)', () => {
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     before(() => {
       cy.window().then((win) => win.sessionStorage.clear());
     });

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/my-account/my-account-v2-notification-preference.e2e.cy.ts

@@ -16,7 +16,7 @@ import { isolateTests } from '../../../support/utils/test-isolation';
 import * as loginHelper from '../../../helpers/my-account-v2/my-account-v2-login-helper';
 
 describe('My Account V2 Notification preference (CXSPA-10780)', () => {
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     describe('Anonymous user (CXSPA-10780)', () => {
       it('should redirect to login page for anonymous user', () => {
         cy.visit('/my-account/notification-preference');

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/my-account/my-account-v2-password.e2e.cy.ts

@@ -17,7 +17,7 @@ export const PAGE_URL_UPDATE_PASSWORD = '/my-account/update-password';
 export const newPassword = 'newPas!sword123!';
 
 describe('My Account V2 - Update Password (CXSPA-10780)', () => {
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     before(() => {
       cy.window().then((win) => win.sessionStorage.clear());
     });

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/my-account/order-history-no-orders-flow.e2e.cy.ts

@@ -9,7 +9,7 @@ import { waitForPage } from '../../../helpers/navigation';
 import { viewportContext } from '../../../helpers/viewport-context';
 
 describe('Order History with no orders', () => {
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     describe('Order History for anonymous user', () => {
       it('should redirect to login page for anonymous user', () => {
         cy.visit('/my-account/orders');

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/my-account/order-history-orders-flow.e2e.cy.ts

@@ -55,11 +55,11 @@ describe('Order History with orders', () => {
 
 describe('Order details page', { testIsolation: false }, () => {
   isolateTestsBefore();
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     let formattedValue: any;
     before(() => {
-      cy.visit('/');
       cy.whenJDK17(() => {
+        cy.visit('/');
         cy.requireLoggedIn();
         doPlaceOrder().then((orderData: any) => {
           formattedValue = orderData.body.totalPrice.formattedValue;

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/my-account/update-email.e2e.cy.ts

@@ -14,7 +14,7 @@ import { viewportContext } from '../../../helpers/viewport-context';
 import { standardUser } from '../../../sample-data/shared-users';
 
 describe('My Account - Update Email', () => {
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     describe('Anonymous user', () => {
       it('should redirect to login page', () => {
         cy.visit(updateEmail.UPDATE_EMAIL_URL);

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/my-account/update-password.e2e.cy.ts

@@ -23,7 +23,7 @@ describe('My Account - Update Password', () => {
     updatePassword.testUpdatePasswordLoggedInUser();
   });
 
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     before(() =>
       cy.window().then((win) => {
         win.sessionStorage.clear();

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/notification/my-interests.e2e.cy.ts

@@ -29,7 +29,7 @@ describe('My interests', () => {
       });
     });
   });
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     describe('Guest', () => {
       before(() => {
         cy.window().then((win) => win.sessionStorage.clear());

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/notification/notification-preference.e2e.cy.ts

@@ -28,7 +28,7 @@ describe('Notification preference', () => {
     });
   });
 
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     describe('Anonymous user', () => {
       before(() => {
         clearAllStorage();

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product-carousel/product-carousel.e2e.cy.ts

@@ -11,7 +11,7 @@ import { viewportContext } from '../../../helpers/viewport-context';
 import { cmsEndpoints } from '../../../helpers/cms-endpoints';
 
 context('Product carousel', () => {
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     beforeEach(() => {
       // Configure ProductCarouselComponent to render Add To Cart buttons for each slide.
       cy.cxConfig({

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product-search/product-search-product-type-flow.e2e.cy.ts

@@ -17,7 +17,7 @@ import {
 import { viewportContext } from '../../../helpers/viewport-context';
 
 context('Product search product type flow', () => {
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     before(() => {
       cy.window().then((win) => win.sessionStorage.clear());
       cy.visit('/');

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/product-search/product-search.core-e2e.cy.ts

@@ -9,7 +9,7 @@ import { viewportContext } from '../../../helpers/viewport-context';
 import { isolateTests } from '../../../support/utils/test-isolation';
 
 context('Product search', { testIsolation: false }, () => {
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     isolateTests();
     before(() => {
       cy.visit('/');

projects/storefrontapp-e2e-cypress/cypress/e2e/regression/save-for-later/save-for-later.e2e.cy.ts

@@ -19,7 +19,7 @@ import {
 import { viewportContext } from '../../../helpers/viewport-context';
 
 context('Save for later', () => {
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     before(() => {
       cy.window().then((win) => win.sessionStorage.clear());
       cy.visit('/');

projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/opf/opf-billing-address.e2e.cy.ts

@@ -20,7 +20,7 @@ import { getSampleUser } from '../../../sample-data/checkout-flow';
 const user = getSampleUser();
 
 describe('OPF billing address', () => {
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     describe('billing address', () => {
       beforeEach(() => {
         cy.requireLoggedIn();

projects/storefrontapp-e2e-cypress/cypress/e2e/vendor/opf/opf-payment-options.e2e.cy.ts

@@ -16,7 +16,7 @@ import { getSampleUser } from '../../../sample-data/checkout-flow';
 const user = getSampleUser();
 
 describe('OPF payment options', () => {
-  viewportContext(['mobile', 'desktop'], () => {
+  viewportContext(['mobile' /*, 'desktop'*/], () => {
     describe('payment options', () => {
       beforeEach(() => {
         cy.requireLoggedIn();

projects/storefrontapp-e2e-cypress/cypress/helpers/b2b/my-company/features/update.ts

@@ -42,7 +42,12 @@ export function updateTest(config: MyCompanyConfig) {
         });
       }
 
-      cy.get(`cx-org-card a.link`).contains('Edit').click();
+      cy.get('cx-org-card a.link')
+        .contains('Edit')
+        .should('be.visible')
+        .and('not.be.disabled')
+        .click();
+
       cy.url().should('contain', `${config.baseUrl}/${entityId}/edit`);
 
       cy.get('cx-org-form div.header h3').contains(

projects/storefrontapp-e2e-cypress/cypress/support/utils/switch-site-context.ts

@@ -11,7 +11,7 @@ export function switchSiteContext(option: string, label: string) {
     ? '.navigation .SiteContext label'
     : '.header .SiteContext label';
 
-  cy.get(selector, { timeout: 10000 })
+  cy.get(selector, { timeout: 30000 })
     .contains(label)
     .should('be.visible')
     .parent()

projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts

@@ -327,7 +327,7 @@ if (environment.cpq) {
         reserveSpaceForImagesOnPdpAndPlp: true,
         lazyLoadImagesByDefault: true,
         incrementProcessesCountForMergeCart: true,
-        authorizationCodeFlowByDefault: false,
+        authorizationCodeFlowByDefault: true,
         defaultLayoutConfigWithoutPageFold: true,
         navigationMenuCloseOnSameLinkClick: true,
         enablePasswordExpiredErrorTranslation: true,