chore: migrate to JDK21 e2e

.env-cmdrc

@@ -1,9 +1,9 @@
 {
   "dev": {
-    "CX_BASE_URL": "https://40.76.109.9:9002"
+    "CX_BASE_URL": "https://spartacus-test.eastus.cloudapp.azure.com:8443"
   },
   "s1": {
-    "CX_BASE_URL": "https://api.c432wmya2v-teamspart3-s1-public.model-t.myhybris.cloud"
+    "CX_BASE_URL": "https://spartacus-test.eastus.cloudapp.azure.com:8443"
   },
   "local": {
     "CX_BASE_URL": "https://localhost:9002"
@@ -12,7 +12,7 @@
     "CX_BASE_URL": "http://localhost:9002"
   },
   "ci": {
-    "CX_BASE_URL": "https://20.83.184.244:9002"
+    "CX_BASE_URL": "https://spartacus-test.eastus.cloudapp.azure.com:8443"
   },
   "ccv2": {
     "CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-p1-public.model-t.myhybris.cloud"

ci-scripts/e2e-a11y-helpers.sh

@@ -47,7 +47,11 @@ stop_pwa_app() {
 build_and_start_pwa() {
     export SPA_ENV="$1"
     npm run build:csr
-    npm run start:pwa &
+    if [[ "$SPA_ENV" == *"b2b"* ]]; then
+        npm run start:pwa:b2b &
+    else
+        npm run start:pwa &
+    fi
     sleep 10
 }
 

ci-scripts/e2e-cypress.sh

@@ -164,41 +164,39 @@ if [[ "${SSR}" = true ]]; then
         npm run e2e:run:ci:ssr
     fi
 else
-    npm run start:pwa &
-
-    echo '-----'
-    echo "Running Cypress end to end tests"
-
-    if [ "${GITHUB_EVENT_NAME}" == "pull_request" ]; then
-        echo "Running Cypress end-to-end tests for pull request"
-
-        if [[ "${GITHUB_HEAD_REF}" == epic/* ]]; then
-            echo "Running full Cypress end-to-end tests for epic branch"
-            run_tests_for_suite "${SUITE}" "full"
-        else
-            echo "Running core Cypress end-to-end tests for pull requests"
-            run_tests_for_suite "${SUITE}" "core"
-        fi
-
-    elif [ "${GITHUB_EVENT_NAME}" == "push" ]; then
-        echo "Running Cypress end-to-end tests for push event"
-
-        if is_bot_commit; then
-            echo "Commit was made by Renovate Bot or Dependabot. Running core Cypress end-to-end tests"
-            run_tests_for_suite "${SUITE}" "core"
-        else
-            echo "Running full Cypress end-to-end tests"
-            run_tests_for_suite "${SUITE}" "full"
-        fi
+    if [[ "$SUITE" == *"b2b"* ]]; then
+        npm run start:pwa:b2b &
     else
-        echo "Running full Cypress end-to-end tests"
-        run_tests_for_suite "${SUITE}" "full"
+        npm run start:pwa &
     fi
 
-    #Force run vendor tests.
-    # echo "Force Running Cypress Vendor Product Configurator end-to-end tests"
-    # run_tests_for_suite ":vendor:product-configurator" "full"
-
-    # echo "Force Running Cypress Vendor CPQ end-to-end tests"
-    # run_tests_for_suite ":vendor:cpq" "full"
+    echo '-----'
+    echo "Running All Cypress end to end tests"
+    run_tests_for_suite "${SUITE}" "full"
+
+#    if [ "${GITHUB_EVENT_NAME}" == "pull_request" ]; then
+#        echo "Running Cypress end-to-end tests for pull request"
+#
+#        if [[ "${GITHUB_HEAD_REF}" == epic/* ]]; then
+#            echo "Running full Cypress end-to-end tests for epic branch"
+#            run_tests_for_suite "${SUITE}" "full"
+#        else
+#            echo "Running core Cypress end-to-end tests for pull requests"
+#            run_tests_for_suite "${SUITE}" "core"
+#        fi
+#
+#    elif [ "${GITHUB_EVENT_NAME}" == "push" ]; then
+#        echo "Running Cypress end-to-end tests for push event"
+#
+#        if is_bot_commit; then
+#            echo "Commit was made by Renovate Bot or Dependabot. Running core Cypress end-to-end tests"
+#            run_tests_for_suite "${SUITE}" "core"
+#        else
+#            echo "Running full Cypress end-to-end tests"
+#            run_tests_for_suite "${SUITE}" "full"
+#        fi
+#    else
+#        echo "Running full Cypress end-to-end tests"
+#        run_tests_for_suite "${SUITE}" "full"
+#    fi
 fi

package.json

@@ -136,16 +136,17 @@
     "prettier": "prettier --config ./.prettierrc --list-different \"{projects,feature-libs,core-libs,integration-libs}/**/*{.ts,.js,.json,.scss,.html}\"",
     "prettier:fix": "prettier --config ./.prettierrc --list-different \"{projects,feature-libs,core-libs,integration-libs}/**/*{.ts,.js,.json,.scss,.html}\" --write",
     "start": "env-cmd --no-override -e dev,b2c,$SPA_ENV nx serve storefrontapp --configuration=development",
-    "start:b2b": "env-cmd --no-override -e dev,b2b,$SPA_ENV nx serve storefrontapp --configuration=development",
+    "start:b2b": "env-cmd --no-override -e dev,b2b,$SPA_ENV nx serve storefrontapp --configuration=development --port=5200",
     "start:ci": "env-cmd --no-override -e ci,b2c,$SPA_ENV nx serve storefrontapp --configuration=development",
-    "start:ci:b2b": "env-cmd --no-override -e ci,b2b,$SPA_ENV nx serve storefrontapp --configuration=development",
+    "start:ci:b2b": "env-cmd --no-override -e ci,b2b,$SPA_ENV nx serve storefrontapp --configuration=development --port=5200",
     "start:opf": "env-cmd --no-override -e opf,$SPA_ENV nx serve storefrontapp --configuration=development",
     "start:opf:ssl": "env-cmd --no-override -e opf,$SPA_ENV nx serve storefrontapp --configuration=development --ssl",
     "start:opf:b2b": "env-cmd --no-override -e b2b,opf,$SPA_ENV nx serve storefrontapp --configuration=development",
     "start:opf:b2b:ssl": "env-cmd --no-override -e b2b,opf,$SPA_ENV nx serve storefrontapp --configuration=development --ssl",
     "start:punchout": "env-cmd --no-override -e punchout,$SPA_ENV nx serve storefrontapp --configuration=development",
     "start:prod": "env-cmd --no-override -e dev,b2c,$SPA_ENV nx serve storefrontapp --configuration=production",
     "start:pwa": " cd ./dist/storefrontapp/browser && http-server -p 4200 --silent --proxy http://localhost:4200?",
+    "start:pwa:b2b": " cd ./dist/storefrontapp/browser && http-server -p 5200 --silent --proxy http://localhost:5200?",
     "test": "nx test",
     "test:all-schematics": "set -e; npm --prefix ./projects/schematics test -- -u; for dir in feature-libs/* integration-libs/*; do (cd $dir && npm run test:schematics -- -u); done",
     "test:libs": "concurrently \"nx test core --code-coverage\" \"nx test storefrontlib --code-coverage\" \"nx test cart --code-coverage\" \"nx test organization --code-coverage\" \"nx test storefinder --code-coverage\" \"nx test smartedit --code-coverage\" \"nx test asm --code-coverage\" \"nx test qualtrics --code-coverage\" \"nx test product --code-coverage\" \"nx test product-configurator --code-coverage\" \"nx test product-multi-dimensional --code-coverage\" \"nx test customer-ticketing --code-coverage\" \"nx test subscription-billing --code-coverage\" \"nx test cdc --code-coverage\" \"nx test s4-service --code-coverage\" \"nx test cdp --code-coverage\" \"nx test opps --code-coverage\" \"nx test setup --code-coverage\" \"nx test checkout --code-coverage\" \"nx test order --code-coverage\" \"nx test digital-payments --code-coverage\" \"nx test epd-visualization --code-coverage\" \"nx test pickup-in-store --code-coverage\" \"nx test s4om --code-coverage\" \"nx test cpq-quote --code-coverage\" \"nx test omf --code-coverage\" \"nx test requested-delivery-date --code-coverage\" \"nx test estimated-delivery-date --code-coverage\" \"nx test pdf-invoices --code-coverage\" \"nx test quote --code-coverage\" \"nx test opf --code-coverage\" \"nx test punchout --code-coverage\"",

projects/core/src/features-config/feature-toggles/config/feature-toggles.ts

@@ -373,7 +373,7 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   unifiedDefaultHeaderSlotsAcrossBreakpoints: true,
   reserveSpaceForImagesOnPdpAndPlp: true,
   lazyLoadImagesByDefault: true,
-  authorizationCodeFlowByDefault: false,
+  authorizationCodeFlowByDefault: true,
   incrementProcessesCountForMergeCart: true,
   dispatchLoginActionOnlyWhenTokenReceived: false,
   defaultLayoutConfigWithoutPageFold: true,

projects/schematics/src/shared/utils/graph-utils_spec.ts

@@ -31,9 +31,9 @@ import {
   SPARTACUS_SEGMENT_REFS,
   SPARTACUS_SMARTEDIT,
   SPARTACUS_STOREFINDER,
+  SPARTACUS_SUBSCRIPTION_BILLING,
   SPARTACUS_TRACKING,
   SPARTACUS_USER,
-  SPARTACUS_SUBSCRIPTION_BILLING,
 } from '../libs-constants';
 import {
   Graph,

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-jdk21-asm.config.ci.ts → projects/storefrontapp-e2e-cypress/cypress-asm.config.ci.ts

@@ -13,7 +13,7 @@ export default defineConfig({
     ...baseConfig.env,
     CLIENT_ID: 'asm_client',
     API_URL:
-      'https://api.c432wmya2v-teamspart3-s4-public.model-t.myhybris.cloud',
+      'https://api.c432wmya2v-teamspart3-s1-public.model-t.myhybris.cloud',
     JDK_VERSION: 'JDK21',
   },
 });

projects/storefrontapp-e2e-cypress/cypress-jdk21.config.ci.ts → projects/storefrontapp-e2e-cypress/cypress-b2b.config.ci.ts

@@ -11,9 +11,13 @@ export default defineConfig({
   ...baseConfig,
   env: {
     ...baseConfig.env,
-    CLIENT_ID: 'mobile_android_public',
-    API_URL:
-      'https://api.c432wmya2v-teamspart3-s4-public.model-t.myhybris.cloud',
-    JDK_VERSION: 'JDK21',
+    CLIENT_ID:
+      baseConfig?.env?.JDK_VERSION === 'JDK21'
+        ? 'mobile_android_public_b2b'
+        : 'mobile_android',
+  },
+  e2e: {
+    ...baseConfig.e2e,
+    baseUrl: 'http://localhost:5200',
   },
 });

projects/storefrontapp-e2e-cypress/cypress-jdk21.config.ts → projects/storefrontapp-e2e-cypress/cypress-b2b.config.ts

@@ -11,9 +11,13 @@ export default defineConfig({
   ...baseConfig,
   env: {
     ...baseConfig.env,
-    CLIENT_ID: 'mobile_android_public',
-    API_URL:
-      'https://api.c432wmya2v-teamspart3-s4-public.model-t.myhybris.cloud',
-    JDK_VERSION: 'JDK21',
+    CLIENT_ID:
+      baseConfig?.env?.JDK_VERSION === 'JDK21'
+        ? 'mobile_android_public_b2b'
+        : 'mobile_android',
+  },
+  e2e: {
+    ...baseConfig.e2e,
+    baseUrl: 'http://localhost:5200',
   },
 });

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

@@ -6,6 +6,15 @@
 
 import { defineConfig } from 'cypress';
 
+const JDK_VERSION: string = 'JDK21';
+const CLIENT_ID =
+  JDK_VERSION === 'JDK21' ? 'mobile_android_public' : 'mobile_android';
+
+const API_URL =
+  JDK_VERSION === 'JDK21'
+    ? 'https://spartacus-test.eastus.cloudapp.azure.com:8443'
+    : 'https://api.c432wmya2v-teamspart3-s3-public.model-t.myhybris.cloud';
+
 export default defineConfig({
   defaultCommandTimeout: 30000,
   requestTimeout: 30000,
@@ -18,18 +27,18 @@ export default defineConfig({
   },
   videoUploadOnPasses: false,
   env: {
-    API_URL: 'https://20.83.184.244:9002',
+    API_URL,
     BASE_SITE: 'electronics-spa',
     BASE_LANG: 'en',
     BASE_CURRENCY: 'USD',
-    CLIENT_ID: 'mobile_android',
+    CLIENT_ID,
     CLIENT_SECRET: 'secret',
     OCC_PREFIX: '/occ/v2',
     OCC_PREFIX_USER_ENDPOINT: 'users',
     OCC_PREFIX_ORDER_ENDPOINT: 'orders',
     MAIL_CCV2_URL: 'https://mailhog-poc.westeurope.cloudapp.azure.com',
     MAIL_CCV2_PREFIX: '/api/v1',
-    JDK_VERSION: 'JDK17',
+    JDK_VERSION,
   },
   e2e: {
     // We've imported your old cypress plugins here.

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

@@ -6,28 +6,40 @@
 
 import { defineConfig } from 'cypress';
 
+const JDK_VERSION: string = 'JDK21';
+const CLIENT_ID =
+  JDK_VERSION === 'JDK21' ? 'mobile_android_public' : 'mobile_android';
+
+const API_URL =
+  JDK_VERSION === 'JDK21'
+    ? 'https://spartacus-test.eastus.cloudapp.azure.com:8443'
+    : 'https://api.c432wmya2v-teamspart3-s3-public.model-t.myhybris.cloud';
+
 export default defineConfig({
-  defaultCommandTimeout: 10000,
-  requestTimeout: 15000,
+  defaultCommandTimeout: 60000,
+  requestTimeout: 60000,
+  projectId: 'k3nmep',
+  numTestsKeptInMemory: 100,
   chromeWebSecurity: false,
+  video: false,
   retries: {
     runMode: 2,
     openMode: 2,
   },
   videoUploadOnPasses: false,
   env: {
-    CLIENT_ID: 'mobile_android',
-    CLIENT_SECRET: 'secret',
-    API_URL: 'https://40.76.109.9:9002',
+    API_URL,
     BASE_SITE: 'electronics-spa',
     BASE_LANG: 'en',
     BASE_CURRENCY: 'USD',
+    CLIENT_ID,
+    CLIENT_SECRET: 'secret',
     OCC_PREFIX: '/occ/v2',
     OCC_PREFIX_USER_ENDPOINT: 'users',
     OCC_PREFIX_ORDER_ENDPOINT: 'orders',
     MAIL_CCV2_URL: 'https://mailhog-poc.westeurope.cloudapp.azure.com',
     MAIL_CCV2_PREFIX: '/api/v1',
-    JDK_VERSION: 'JDK17',
+    JDK_VERSION,
   },
   e2e: {
     // We've imported your old cypress plugins here.