Test e2e prod

Author: zxl629

.github/workflows/callable-local-e2e-test.yml

@@ -62,7 +62,36 @@ jobs:
         uses: ./amplify-data/.github/actions/load-verdaccio-with-amplify-data
       - name: Make script executable
         run: chmod +x ./amplify-data/scripts/retry-npm-script.sh
-      - name: Run cypress tests for webpack e2e test dev
+      # - name: Run cypress tests for webpack e2e test dev
+      #   shell: bash
+      #   working-directory: ./amplify-data
+      #   env:
+      #     E2E_FRAMEWORK: ${{ inputs.framework }}
+      #     E2E_SAMPLE_NAME: ${{ matrix.sample_name }}
+      #     E2E_SPEC: ${{ inputs.spec }}
+      #     E2E_BROWSER: ${{ matrix.browser }}
+      #     E2E_BACKEND: ${{ inputs.backend }}
+      #     E2E_RETRY_COUNT: ${{ inputs.retry_count }}
+      #     E2E_TEST_NAME: ${{ inputs.test_name }}
+      #     E2E_NPM_SCRIPT: ${{ inputs.npm_script }}
+      #     E2E_ENV: ${{ inputs.env }}
+      #   run: |
+      #     if [ -z "$E2E_NPM_SCRIPT" ]; then
+      #       ../amplify-data/scripts/retry-npm-script.sh -s \
+      #       "ci:test \
+      #       $E2E_FRAMEWORK \
+      #       $E2E_SAMPLE_NAME \
+      #       $E2E_SPEC \
+      #       $E2E_BROWSER \
+      #       dev \
+      #       $E2E_BACKEND \
+      #       --env $(echo $E2E_ENV | jq -r 'tostring')" \
+      #       $E2E_NPM_SCRIPT \
+      #       -n $E2E_RETRY_COUNT
+      #     else
+      #       echo "Skipping specialized yarn script execution in the dev environment."
+      #     fi
+      - name: Run cypress tests for ${{ inputs.test_name }} prod
         shell: bash
         working-directory: ./amplify-data
         env:
@@ -74,6 +103,7 @@ jobs:
           E2E_RETRY_COUNT: ${{ inputs.retry_count }}
           E2E_TEST_NAME: ${{ inputs.test_name }}
           E2E_NPM_SCRIPT: ${{ inputs.npm_script }}
+          E2E_NPM_SCRIPT_ARGS: ${{ inputs.npm_script_args }}
           E2E_ENV: ${{ inputs.env }}
         run: |
           if [ -z "$E2E_NPM_SCRIPT" ]; then
@@ -83,13 +113,13 @@ jobs:
             $E2E_SAMPLE_NAME \
             $E2E_SPEC \
             $E2E_BROWSER \
-            dev \
+            prod \
             $E2E_BACKEND \
             --env $(echo $E2E_ENV | jq -r 'tostring')" \
             $E2E_NPM_SCRIPT \
             -n $E2E_RETRY_COUNT
           else
-            echo "Skipping specialized yarn script execution in the dev environment."
+            npm run "$E2E_NPM_SCRIPT" "$E2E_NPM_SCRIPT_ARGS"
           fi
       - name: Upload artifact
         uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 https://github.com/actions/upload-artifact/commit/0b7f8abb1508181956e8e162db84b466c27e18ce

.github/workflows/callable-local-e2e-webpack-test.yml

@@ -3,7 +3,7 @@ import {parseArgs} from 'node:util';
 import fsExtra from 'fs-extra';
 import common from './common.js';
 const {logError} = common;
-const { pathExistsSync } = fsExtra
+const { pathExistsSync } = fsExtra;
 
 const defaultTimeout = 5 * 60 * 1000; // 5 minutes
 
@@ -117,17 +117,6 @@ const runAppOnProd = ({ framework, sample, backend, env }) => {
 	const sampleDir = sampleDirectory({ framework, sample });
 	let distDir; // distribution directory
 	if (framework === FRAMEWORKS.webpack) {
-		const { name } = JSON.parse(fs.readFileSync(`${sampleDir}/package.json`));
-		distDir = `${sampleDir}/dist/${name}`;
-	} else if (framework === FRAMEWORKS.react || framework === FRAMEWORKS.next) {
-		distDir = `${sampleDir}/build`;
-	} else if (framework === FRAMEWORKS.vue || framework === FRAMEWORKS.vite) {
-		distDir = `${sampleDir}/dist`;
-	} else if (framework === FRAMEWORKS.rollup) {
-		distDir = `${sampleDir}/public`;
-	} else if (framework === FRAMEWORKS.ionic) {
-		distDir = `${sampleDir}/www`;
-	} else if (framework === FRAMEWORKS.javascript) {
 		distDir = `${sampleDir}/dist`;
 	} else {
 		logError(`unknown framework: ${framework}`);
@@ -151,7 +140,7 @@ const runAppOnProd = ({ framework, sample, backend, env }) => {
 	const command = [
 		envVars && `export ${envVars}`,
 		install,
-		`npm --prefix ${sampleDir} run ${buildCommand} ${prodFlag}`,
+		`npm run ${buildCommand} --prefix ${sampleDir}`,
 		serveCommand,
 	]
 		.filter(Boolean)