Skip to content

Commit

Permalink
PWA-3155 (#4123)
Browse files Browse the repository at this point in the history 
Co-authored-by: arpit khare <[email protected]>
  • Loading branch information
@glo82145 @glo42707
glo82145 and glo42707 authored May 25, 2023
1 parent defc0c8 commit 836aa40
Show file tree
Hide file tree
Showing 45 changed files with 251 additions and 251 deletions.
2 changes: 1 addition & 1 deletion docker/.env.docker.dev
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ DEV_SERVER_HOST=pwa-docker.localhost
DEV_SERVER_PORT=8080
DEV_SERVER_SERVICE_WORKER_ENABLED=false
DEV_SERVER_WATCH_OPTIONS_USE_POLLING=0
MAGENTO_BACKEND_URL=https://master-7rqtwti-mfwmkrjfqvbjk.us-4.magentosite.cloud/
MAGENTO_BACKEND_URL=https://master-7rqtwti-c5v7sxvquxwl4.eu-4.magentosite.cloud/
CUSTOM_ORIGIN_ENABLED=0
UPWARD_JS_UPWARD_PATH=upward.yml
UPWARD_JS_BIND_LOCAL=1
Expand Down
4 changes: 2 additions & 2 deletions packages/create-pwa/__tests__/__snapshots__/create-pwa.spec.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Array [
Object {
"name": "Magento 2.3.3 with Venia sample data installed",
"short": "2.3.3-venia-cloud",
"value": "https://master-7rqtwti-mfwmkrjfqvbjk.us-4.magentosite.cloud/",
"value": "https://master-7rqtwti-c5v7sxvquxwl4.eu-4.magentosite.cloud/",
},
Object {
"name": "Other (I will provide my own backing Magento instance)",
Expand Down Expand Up @@ -94,7 +94,7 @@ Array [
"
Running command:
[97mbuildpack create-project test --name \\"test\\" --author \\"Gooston <[email protected]>\\" --template \\"@magento/[email protected]\\" --backend-url \\"https://master-7rqtwti-mfwmkrjfqvbjk.us-4.magentosite.cloud/\\" --backend-edition \\"AC\\" --braintree-token \\"sandbox_8yrzsvtm_s2bg8fs563crhqzk\\" --npm-client \\"yarn\\" --no-install[39m
[97mbuildpack create-project test --name \\"test\\" --author \\"Gooston <[email protected]>\\" --template \\"@magento/[email protected]\\" --backend-url \\"https://master-7rqtwti-c5v7sxvquxwl4.eu-4.magentosite.cloud/\\" --backend-edition \\"AC\\" --braintree-token \\"sandbox_8yrzsvtm_s2bg8fs563crhqzk\\" --npm-client \\"yarn\\" --no-install[39m

",
],
Expand Down
10 changes: 5 additions & 5 deletions packages/create-pwa/__tests__/create-pwa.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jest.mock('inquirer', () => ({
author: 'Gooston <[email protected]>',
template: '@magento/[email protected]',
backendUrl:
'https://master-7rqtwti-mfwmkrjfqvbjk.us-4.magentosite.cloud/',
'https://master-7rqtwti-c5v7sxvquxwl4.eu-4.magentosite.cloud/',
backendEdition: 'AC',
braintreeToken: 'sandbox_8yrzsvtm_s2bg8fs563crhqzk',
npmClient: 'yarn',
Expand Down Expand Up @@ -65,7 +65,7 @@ beforeAll(() => {
description:
'Magento 2.3.3 with Venia sample data installed',
url:
'https://master-7rqtwti-mfwmkrjfqvbjk.us-4.magentosite.cloud/'
'https://master-7rqtwti-c5v7sxvquxwl4.eu-4.magentosite.cloud/'
},
{
name: '2.3.4-venia-cloud',
Expand Down Expand Up @@ -221,14 +221,14 @@ test('should execute buildpack with answers provided', async () => {
await createPWA();

expect(execa.shell.mock.calls[0][0]).toMatchInlineSnapshot(
`"BUILDPACK_LOCATION create-project test --name \\"test\\" --author \\"Gooston <[email protected]>\\" --template \\"@magento/[email protected]\\" --backend-url \\"https://master-7rqtwti-mfwmkrjfqvbjk.us-4.magentosite.cloud/\\" --backend-edition \\"AC\\" --braintree-token \\"sandbox_8yrzsvtm_s2bg8fs563crhqzk\\" --npm-client \\"yarn\\" --no-install"`
`"BUILDPACK_LOCATION create-project test --name \\"test\\" --author \\"Gooston <[email protected]>\\" --template \\"@magento/[email protected]\\" --backend-url \\"https://master-7rqtwti-c5v7sxvquxwl4.eu-4.magentosite.cloud/\\" --backend-edition \\"AC\\" --braintree-token \\"sandbox_8yrzsvtm_s2bg8fs563crhqzk\\" --npm-client \\"yarn\\" --no-install"`
);
});

test('should not include customBackendUrl in shell script', async () => {
inquirer.prompt.mockResolvedValueOnce({
customBackendUrl:
'https://master-7rqtwti-mfwmkrjfqvbjk.us-4.magentosite.cloud/',
'https://master-7rqtwti-c5v7sxvquxwl4.eu-4.magentosite.cloud/',
directory: 'test',
name: 'test',
author: 'Gooston <[email protected]>',
Expand All @@ -242,7 +242,7 @@ test('should not include customBackendUrl in shell script', async () => {
await createPWA();

expect(execa.shell.mock.calls[0][0]).toMatchInlineSnapshot(
`"BUILDPACK_LOCATION create-project test --name \\"test\\" --author \\"Gooston <[email protected]>\\" --template \\"@magento/[email protected]\\" --backend-url \\"https://master-7rqtwti-mfwmkrjfqvbjk.us-4.magentosite.cloud/\\" --backend-edition \\"AC\\" --braintree-token \\"sandbox_8yrzsvtm_s2bg8fs563crhqzk\\" --npm-client \\"yarn\\" --no-install"`
`"BUILDPACK_LOCATION create-project test --name \\"test\\" --author \\"Gooston <[email protected]>\\" --template \\"@magento/[email protected]\\" --backend-url \\"https://master-7rqtwti-c5v7sxvquxwl4.eu-4.magentosite.cloud/\\" --backend-edition \\"AC\\" --braintree-token \\"sandbox_8yrzsvtm_s2bg8fs563crhqzk\\" --npm-client \\"yarn\\" --no-install"`
);
});

Expand Down
6 changes: 3 additions & 3 deletions ...s/extensions/experience-platform-connector/src/__tests__/__snapshots__/utils.spec.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Array [
},
"product": Object {
"canonicalUrl": "rowena-skirt",
"mainImageUrl": "https://master-7rqtwti-mfwmkrjfqvbjk.us-4.magentosite.cloud/media/catalog/product/cache/609faca36a4bc16a754bc2f43c184970/v/s/vsk02-ll_main_2.jpg",
"mainImageUrl": "https://master-7rqtwti-c5v7sxvquxwl4.eu-4.magentosite.cloud/media/catalog/product/cache/609faca36a4bc16a754bc2f43c184970/v/s/vsk02-ll_main_2.jpg",
"name": "Rowena Skirt",
"pricing": Object {
"currencyCode": "USD",
Expand Down Expand Up @@ -72,7 +72,7 @@ Array [
},
"product": Object {
"canonicalUrl": "silver-cirque-earrings",
"mainImageUrl": "https://master-7rqtwti-mfwmkrjfqvbjk.us-4.magentosite.cloud/media/catalog/product/cache/609faca36a4bc16a754bc2f43c184970/v/a/va17-si_main.jpg",
"mainImageUrl": "https://master-7rqtwti-c5v7sxvquxwl4.eu-4.magentosite.cloud/media/catalog/product/cache/609faca36a4bc16a754bc2f43c184970/v/a/va17-si_main.jpg",
"name": "Silver Cirque Earrings",
"pricing": Object {
"currencyCode": "USD",
Expand Down Expand Up @@ -120,7 +120,7 @@ Array [
},
"product": Object {
"canonicalUrl": "antonia-infinity-scarf",
"mainImageUrl": "https://master-7rqtwti-mfwmkrjfqvbjk.us-4.magentosite.cloud/media/catalog/product/cache/609faca36a4bc16a754bc2f43c184970/v/a/va04-ll_main_2.jpg",
"mainImageUrl": "https://master-7rqtwti-c5v7sxvquxwl4.eu-4.magentosite.cloud/media/catalog/product/cache/609faca36a4bc16a754bc2f43c184970/v/a/va04-ll_main_2.jpg",
"name": "Antonia Infinity Scarf",
"pricing": Object {
"currencyCode": "USD",
Expand Down
Loading

0 comments on commit 836aa40

Please sign in to comment.