Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env-cmdrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dev": {
"CX_BASE_URL": "https://40.76.109.9:9002"
"CX_BASE_URL": "https://api.c432wmya2v-teamspart3-s4-public.model-t.myhybris.cloud"
},
"s1": {
"CX_BASE_URL": "https://api.c432wmya2v-teamspart3-s1-public.model-t.myhybris.cloud"
Expand All @@ -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.c432wmya2v-teamspart3-s4-public.model-t.myhybris.cloud"
},
"ccv2": {
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-p1-public.model-t.myhybris.cloud"
Expand Down
76 changes: 36 additions & 40 deletions ci-scripts/e2e-cypress.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ run_tests_for_suite() {
source "$(dirname "$0")/e2e-a11y-helpers.sh"
run_dual_a11y_tests
elif [ "$scope" == "core" ]; then
npm run e2e:run:ci:core"${suite}"
npm run e2e:run:ci:core:jdk21"${suite}"
else
npm run e2e:run:ci"${suite}"
npm run e2e:run:ci:jdk21"${suite}"
fi
}

Expand Down Expand Up @@ -143,62 +143,58 @@ if [[ "${SSR}" = true ]]; then
if [[ "${GITHUB_HEAD_REF}" == epic/* ]]; then
echo "Running Cypress end to end tests for pull request"

npm run e2e:run:ci:ssr
npm run e2e:run:ci:ssr:jdk21
else
echo "Running core Cypress end to end tests for pull requests"

npm run e2e:run:ci:core:ssr
npm run e2e:run:ci:core:ssr:jdk21
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"
npm run e2e:run:ci:core:ssr
npm run e2e:run:ci:core:ssr:jdk21
else
echo "Running full Cypress end-to-end tests"
npm run e2e:run:ci:ssr
npm run e2e:run:ci:ssr:jdk21
fi
else
echo "Running full Cypress end-to-end tests"
npm run e2e:run:ci:ssr
npm run e2e:run:ci:ssr:jdk21
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
else
echo "Running full Cypress end-to-end tests"
run_tests_for_suite "${SUITE}" "full"
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 "Run all..."

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
10 changes: 5 additions & 5 deletions core-libs/setup/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spartacus/setup",
"version": "2211.43.0",
"version": "2211.44.0-2",
"description": "Includes features that makes Spartacus and it's setup easier and streamlined.",
"keywords": [
"spartacus",
Expand All @@ -21,10 +21,10 @@
"peerDependencies": {
"@angular/core": "^19.0.3",
"@angular/ssr": "^19.0.4",
"@spartacus/cart": "2211.43.0",
"@spartacus/core": "2211.43.0",
"@spartacus/order": "2211.43.0",
"@spartacus/user": "2211.43.0"
"@spartacus/cart": "2211.44.0-2",
"@spartacus/core": "2211.44.0-2",
"@spartacus/order": "2211.44.0-2",
"@spartacus/user": "2211.44.0-2"
},
"optionalDependencies": {
"@angular/platform-server": "^19.0.3",
Expand Down
18 changes: 9 additions & 9 deletions feature-libs/asm/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spartacus/asm",
"version": "2211.43.0",
"version": "2211.44.0-2",
"description": "ASM feature library for Spartacus",
"keywords": [
"spartacus",
Expand Down Expand Up @@ -32,14 +32,14 @@
"@ng-select/ng-select": "^14.1.0",
"@ngrx/effects": "^19.0.0",
"@ngrx/store": "^19.0.0",
"@spartacus/cart": "2211.43.0",
"@spartacus/core": "2211.43.0",
"@spartacus/order": "2211.43.0",
"@spartacus/schematics": "2211.43.0",
"@spartacus/storefinder": "2211.43.0",
"@spartacus/storefront": "2211.43.0",
"@spartacus/styles": "2211.43.0",
"@spartacus/user": "2211.43.0",
"@spartacus/cart": "2211.44.0-2",
"@spartacus/core": "2211.44.0-2",
"@spartacus/order": "2211.44.0-2",
"@spartacus/schematics": "2211.44.0-2",
"@spartacus/storefinder": "2211.44.0-2",
"@spartacus/storefront": "2211.44.0-2",
"@spartacus/styles": "2211.44.0-2",
"@spartacus/user": "2211.44.0-2",
"rxjs": "^7.8.0"
},
"engines": {
Expand Down
12 changes: 6 additions & 6 deletions feature-libs/cart/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spartacus/cart",
"version": "2211.43.0",
"version": "2211.44.0-2",
"description": "",
"keywords": [
"spartacus",
Expand Down Expand Up @@ -37,11 +37,11 @@
"@ng-select/ng-select": "^14.1.0",
"@ngrx/effects": "^19.0.0",
"@ngrx/store": "^19.0.0",
"@spartacus/core": "2211.43.0",
"@spartacus/schematics": "2211.43.0",
"@spartacus/storefront": "2211.43.0",
"@spartacus/styles": "2211.43.0",
"@spartacus/user": "2211.43.0",
"@spartacus/core": "2211.44.0-2",
"@spartacus/schematics": "2211.44.0-2",
"@spartacus/storefront": "2211.44.0-2",
"@spartacus/styles": "2211.44.0-2",
"@spartacus/user": "2211.44.0-2",
"rxjs": "^7.8.0"
},
"engines": {
Expand Down
16 changes: 8 additions & 8 deletions feature-libs/checkout/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spartacus/checkout",
"version": "2211.43.0",
"version": "2211.44.0-2",
"description": "Checkout feature library for Spartacus",
"keywords": [
"spartacus",
Expand Down Expand Up @@ -32,13 +32,13 @@
"@angular/router": "^19.0.3",
"@ng-select/ng-select": "^14.1.0",
"@ngrx/store": "^19.0.0",
"@spartacus/cart": "2211.43.0",
"@spartacus/core": "2211.43.0",
"@spartacus/order": "2211.43.0",
"@spartacus/schematics": "2211.43.0",
"@spartacus/storefront": "2211.43.0",
"@spartacus/styles": "2211.43.0",
"@spartacus/user": "2211.43.0",
"@spartacus/cart": "2211.44.0-2",
"@spartacus/core": "2211.44.0-2",
"@spartacus/order": "2211.44.0-2",
"@spartacus/schematics": "2211.44.0-2",
"@spartacus/storefront": "2211.44.0-2",
"@spartacus/styles": "2211.44.0-2",
"@spartacus/user": "2211.44.0-2",
"rxjs": "^7.8.0"
},
"engines": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ import { defaultCmsContentProviders, layoutConfigFactory, mediaConfig } from "@s
},
}), provideConfig(<FeaturesConfig>{
features: {
level: '2211.43'
level: '2211.44'
}
}), provideConfig(defaultB2bOccConfig)]
})
Expand Down Expand Up @@ -532,7 +532,7 @@ import { defaultCmsContentProviders, layoutConfigFactory, mediaConfig } from "@s
},
}), provideConfig(<FeaturesConfig>{
features: {
level: '2211.43'
level: '2211.44'
}
}), provideConfig(defaultB2bOccConfig)]
})
Expand Down
12 changes: 6 additions & 6 deletions feature-libs/customer-ticketing/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spartacus/customer-ticketing",
"version": "2211.43.0",
"version": "2211.44.0-2",
"description": "Customer-Ticketing library for Spartacus",
"keywords": [
"spartacus",
Expand Down Expand Up @@ -31,11 +31,11 @@
"@angular/forms": "^19.0.3",
"@angular/router": "^19.0.3",
"@ng-select/ng-select": "^14.1.0",
"@spartacus/cart": "2211.43.0",
"@spartacus/core": "2211.43.0",
"@spartacus/schematics": "2211.43.0",
"@spartacus/storefront": "2211.43.0",
"@spartacus/styles": "2211.43.0",
"@spartacus/cart": "2211.44.0-2",
"@spartacus/core": "2211.44.0-2",
"@spartacus/schematics": "2211.44.0-2",
"@spartacus/storefront": "2211.44.0-2",
"@spartacus/styles": "2211.44.0-2",
"rxjs": "^7.8.0"
},
"engines": {
Expand Down
14 changes: 7 additions & 7 deletions feature-libs/estimated-delivery-date/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spartacus/estimated-delivery-date",
"version": "2211.43.0",
"version": "2211.44.0-2",
"description": "Estimated Delivery Date library for Spartacus",
"keywords": [
"spartacus",
Expand Down Expand Up @@ -28,12 +28,12 @@
"@angular-devkit/schematics": "^19.0.4",
"@angular/common": "^19.0.3",
"@angular/core": "^19.0.3",
"@spartacus/cart": "2211.43.0",
"@spartacus/core": "2211.43.0",
"@spartacus/order": "2211.43.0",
"@spartacus/schematics": "2211.43.0",
"@spartacus/storefront": "2211.43.0",
"@spartacus/styles": "2211.43.0",
"@spartacus/cart": "2211.44.0-2",
"@spartacus/core": "2211.44.0-2",
"@spartacus/order": "2211.44.0-2",
"@spartacus/schematics": "2211.44.0-2",
"@spartacus/storefront": "2211.44.0-2",
"@spartacus/styles": "2211.44.0-2",
"rxjs": "^7.8.0"
},
"engines": {
Expand Down
16 changes: 8 additions & 8 deletions feature-libs/order/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spartacus/order",
"version": "2211.43.0",
"version": "2211.44.0-2",
"description": "Order feature library for Spartacus",
"keywords": [
"spartacus",
Expand Down Expand Up @@ -33,13 +33,13 @@
"@ng-select/ng-select": "^14.1.0",
"@ngrx/effects": "^19.0.0",
"@ngrx/store": "^19.0.0",
"@spartacus/cart": "2211.43.0",
"@spartacus/core": "2211.43.0",
"@spartacus/pdf-invoices": "2211.43.0",
"@spartacus/schematics": "2211.43.0",
"@spartacus/storefront": "2211.43.0",
"@spartacus/styles": "2211.43.0",
"@spartacus/user": "2211.43.0",
"@spartacus/cart": "2211.44.0-2",
"@spartacus/core": "2211.44.0-2",
"@spartacus/pdf-invoices": "2211.44.0-2",
"@spartacus/schematics": "2211.44.0-2",
"@spartacus/storefront": "2211.44.0-2",
"@spartacus/styles": "2211.44.0-2",
"@spartacus/user": "2211.44.0-2",
"rxjs": "^7.8.0"
},
"engines": {
Expand Down
16 changes: 8 additions & 8 deletions feature-libs/organization/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spartacus/organization",
"version": "2211.43.0",
"version": "2211.44.0-2",
"description": "Organization library for Spartacus",
"keywords": [
"spartacus",
Expand Down Expand Up @@ -33,13 +33,13 @@
"@ng-select/ng-select": "^14.1.0",
"@ngrx/effects": "^19.0.0",
"@ngrx/store": "^19.0.0",
"@spartacus/cart": "2211.43.0",
"@spartacus/core": "2211.43.0",
"@spartacus/order": "2211.43.0",
"@spartacus/schematics": "2211.43.0",
"@spartacus/storefront": "2211.43.0",
"@spartacus/styles": "2211.43.0",
"@spartacus/user": "2211.43.0",
"@spartacus/cart": "2211.44.0-2",
"@spartacus/core": "2211.44.0-2",
"@spartacus/order": "2211.44.0-2",
"@spartacus/schematics": "2211.44.0-2",
"@spartacus/storefront": "2211.44.0-2",
"@spartacus/styles": "2211.44.0-2",
"@spartacus/user": "2211.44.0-2",
"rxjs": "^7.8.0"
},
"engines": {
Expand Down
Loading