From 023528f60d448f7d94cd83b5d15630dd3d6d7406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=20=E2=98=82=EF=B8=8F?= Date: Wed, 26 Jul 2023 11:20:12 -0700 Subject: [PATCH 1/4] fix(amplify-e2e-core): amplifyPush --- packages/amplify-e2e-core/src/init/amplifyPush.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/amplify-e2e-core/src/init/amplifyPush.ts b/packages/amplify-e2e-core/src/init/amplifyPush.ts index 9b130bffc08..42ff0adeb66 100644 --- a/packages/amplify-e2e-core/src/init/amplifyPush.ts +++ b/packages/amplify-e2e-core/src/init/amplifyPush.ts @@ -44,10 +44,12 @@ export const amplifyPush = async (cwd: string, testingWithLatestCodebase = false const pushArgs = ['push', ...(opts?.minify ? ['--minify'] : [])]; // Test amplify push await spawn(getCLIPath(testingWithLatestCodebase), pushArgs, { cwd, stripColors: true, noOutputTimeout: pushTimeoutMS }) - .wait('Are you sure you want to continue?') + .wait('Are you sure you want to continue "amplify push"?') .sendYes() + .sendCarriageReturn() .wait('Do you want to generate code for your newly created GraphQL API') - .sendConfirmNo() + .sendNo() + .sendCarriageReturn() .wait(/.*/) .runAsync(); }; From 7bdc7f32070cb06471b8ffdca7d9fd9ea304c4e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=20=E2=98=82=EF=B8=8F?= Date: Wed, 26 Jul 2023 11:22:01 -0700 Subject: [PATCH 2/4] fix(amplify-e2e-tests): .env sample --- packages/amplify-e2e-tests/sample.env | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/amplify-e2e-tests/sample.env b/packages/amplify-e2e-tests/sample.env index 44785f9214b..e8a5f11d74c 100644 --- a/packages/amplify-e2e-tests/sample.env +++ b/packages/amplify-e2e-tests/sample.env @@ -2,6 +2,7 @@ AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= AWS_SESSION_TOKEN= +CLI_REGION= # Used for Auth Hosted UI FACEBOOK_APP_ID=fbAppId @@ -20,12 +21,9 @@ APPLE_KEY_ID=2QLZXKYJ8J APPLE_PRIVATE_KEY=----BEGIN PRIVATE KEY-----MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgIltgNsTgTfSzUadYiCS0VYtDDMFln/J8i1yJsSIw5g+gCgYIKoZIzj0DAQehRANCAASI8E0L/DhR/mIfTT07v3VwQu6q8I76lgn7kFhT0HvWoLuHKGQFcFkXXCgztgBrprzd419mUChAnKE6y89bWcNw----END PRIVATE KEY---- APPLE_PRIVATE_KEY_2=----BEGIN PRIVATE KEY-----MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgIltgNsTgTfSzUadYiCS0VYtDDMFln/J8i1yJsSIw5g+gCgYIKoZIzj0DAQehRANCAASI8E0L/DhR/mIfTT07v3VwQu6q8I76lgn7kFhT0HvWoLuHKGQFcFkXXCgztgBrprzd419mUChAnKE6y89bWcNw----END PRIVATE KEY---- -#Used for delete test -AWS_ACCESS_KEY_ID= -AWS_SECRET_ACCESS_KEY= -CLI_REGION= - # Used for cleanup script CIRCLECI_TOKEN = '' # Token used for querying CircleCI to get the build details CIRCLE_PROJECT_USERNAME='' CIRCLE_PROJECT_REPONAME='amplify-cli' + +AMPLIFY_PATH= From 295ec9040456514bd5e93edc16d9900b56be062a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=20=E2=98=82=EF=B8=8F?= Date: Wed, 26 Jul 2023 12:28:48 -0700 Subject: [PATCH 3/4] fix(amplify-e2e-tests): .env sample add comment --- packages/amplify-e2e-tests/sample.env | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/amplify-e2e-tests/sample.env b/packages/amplify-e2e-tests/sample.env index e8a5f11d74c..224a235b01e 100644 --- a/packages/amplify-e2e-tests/sample.env +++ b/packages/amplify-e2e-tests/sample.env @@ -26,4 +26,9 @@ CIRCLECI_TOKEN = '' # Token used for querying CircleCI to get the bu CIRCLE_PROJECT_USERNAME='' CIRCLE_PROJECT_REPONAME='amplify-cli' -AMPLIFY_PATH= +# Path to the Amplify CLI executable. +# When working locally it should be set to the `bin/amplify` file in the workspace. +# e.g. "packages/amplify-cli/bin/amplify". +# When running regular e2e test, if working locally with migration test, it should point to older version of amplify. +# Absolute paths are recommended. +AMPLIFY_PATH= From 4ad7631a005306761a8081fd052faf97d2ff4b15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MJ=20=E2=98=82=EF=B8=8F?= Date: Wed, 26 Jul 2023 13:59:12 -0700 Subject: [PATCH 4/4] fix(amplify-e2e-core): change 'Are you sure you want to continue' back --- packages/amplify-e2e-core/src/init/amplifyPush.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/amplify-e2e-core/src/init/amplifyPush.ts b/packages/amplify-e2e-core/src/init/amplifyPush.ts index 42ff0adeb66..a69b1737453 100644 --- a/packages/amplify-e2e-core/src/init/amplifyPush.ts +++ b/packages/amplify-e2e-core/src/init/amplifyPush.ts @@ -44,7 +44,7 @@ export const amplifyPush = async (cwd: string, testingWithLatestCodebase = false const pushArgs = ['push', ...(opts?.minify ? ['--minify'] : [])]; // Test amplify push await spawn(getCLIPath(testingWithLatestCodebase), pushArgs, { cwd, stripColors: true, noOutputTimeout: pushTimeoutMS }) - .wait('Are you sure you want to continue "amplify push"?') + .wait('Are you sure you want to continue?') .sendYes() .sendCarriageReturn() .wait('Do you want to generate code for your newly created GraphQL API')