Address review comments and made updates post discussion

Author: Bhavna-Ramachandran

.github/actions/e2e/action.yml

@@ -17,8 +17,6 @@ inputs:
     description: "mfa key for staging test user"
   playwright_tags:
     description: "pipe separated list of tags denoting groups of tests to run"
-  playwright_tags_invert:
-    description: "pipe separated list of tags to exclude from test run"
   total_shards:
     description: "total number of test shards in parent run"
     default: "1"
@@ -43,9 +41,9 @@ inputs:
   node_options:
     description: "options to pass to node"
     default: "--dns-result-order=ipv4first"
-  report_name_prefix:
-    description: "prefix for blob report artifact name"
-    default: "blob-report"
+  workers:
+    description: "number of workers to use for test run"
+    default: ""
 outputs:
   artifact-id:
     description: "artifact ids for uploaded test reports"
@@ -85,13 +83,14 @@ runs:
         npx playwright install --with-deps
 
     - name: Run all e2e tests (Shard ${{ inputs.current_shard }}/${{ inputs.total_shards }})
-      if: ${{ inputs.playwright_tags == '' && inputs.playwright_tags_invert == '' }}
+      if: ${{ inputs.playwright_tags == '' }}
       working-directory: ./frontend
       env:
         CI: true
         TOTAL_SHARDS: ${{ inputs.total_shards }}
         CURRENT_SHARD: ${{ inputs.current_shard }}
         PLAYWRIGHT_TARGET_ENV: ${{ inputs.target }}
+        PLAYWRIGHT_WORKERS: ${{ inputs.workers }}
         STAGING_TEST_USER_EMAIL: ${{ inputs.staging_test_user_email }}
         STAGING_TEST_USER_PASSWORD: ${{ inputs.staging_test_user_password }}
         STAGING_TEST_USER_MFA_KEY: ${{ inputs.staging_test_user_mfa_key }}
@@ -107,28 +106,14 @@ runs:
         TOTAL_SHARDS: ${{ inputs.total_shards }}
         CURRENT_SHARD: ${{ inputs.current_shard }}
         PLAYWRIGHT_TARGET_ENV: ${{ inputs.target }}
+        PLAYWRIGHT_WORKERS: ${{ inputs.workers }}
         STAGING_TEST_USER_EMAIL: ${{ inputs.staging_test_user_email }}
         STAGING_TEST_USER_PASSWORD: ${{ inputs.staging_test_user_password }}
         STAGING_TEST_USER_MFA_KEY: ${{ inputs.staging_test_user_mfa_key }}
       run: |
         npm run test:e2e -- --grep "${{ inputs.playwright_tags }}"
       shell: bash
 
-    - name: Run e2e tests excluding ${{ inputs.playwright_tags_invert }} (Shard ${{ inputs.current_shard }}/${{ inputs.total_shards }})
-      if: ${{ inputs.playwright_tags_invert != '' }}
-      working-directory: ./frontend
-      env:
-        CI: true
-        TOTAL_SHARDS: ${{ inputs.total_shards }}
-        CURRENT_SHARD: ${{ inputs.current_shard }}
-        PLAYWRIGHT_TARGET_ENV: ${{ inputs.target }}
-        STAGING_TEST_USER_EMAIL: ${{ inputs.staging_test_user_email }}
-        STAGING_TEST_USER_PASSWORD: ${{ inputs.staging_test_user_password }}
-        STAGING_TEST_USER_MFA_KEY: ${{ inputs.staging_test_user_mfa_key }}
-      run: |
-        npm run test:e2e -- --grep-invert "${{ inputs.playwright_tags_invert }}"
-      shell: bash
-
     - name: Debug logging on failure
       if: ${{ failure() && inputs.api_logs == 'true' }}
       working-directory: ./frontend
@@ -160,6 +145,6 @@ runs:
       if: always()
       uses: actions/upload-artifact@v6
       with:
-        name: ${{ inputs.report_name_prefix }}-shard-${{ inputs.current_shard }}
+        name: blob-report-shard-${{ inputs.current_shard }}
         path: /home/runner/work/simpler-grants-gov/simpler-grants-gov/frontend/blob-report
         retention-days: 1

.github/workflows/e2e-create-report.yml

@@ -39,11 +39,7 @@ jobs:
           path: frontend/all-blob-reports
           # artifact-ids: ${{ inputs.artifact-ids }}
           run-id: ${{ inputs.run_id }}
-          # Matches report_name_prefix values set by callers:
-          # - blob-report-no-auth (e2e-staging.yml sharded job)
-          # - blob-report-auth (e2e-staging.yml auth job)
-          # - blob-report (ci-frontend-e2e.yml default)
-          pattern: blob-report*-shard-*
+          pattern: blob-report-shard-*
           merge-multiple: true
       - name: Verify Downloaded Artifacts
         run: |

.github/workflows/e2e-staging.yml

@@ -24,34 +24,7 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 jobs:
-  e2e-tests-no-auth-sharded:
-    name: Run Non-Auth E2E Tests
-    runs-on: ubuntu-22.04
-    strategy:
-      fail-fast: false
-      matrix:
-        shard: [1, 2, 3, 4]
-        total_shards: [4]
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-      - name: Set target
-        run: if [[ -z "${{ inputs.target }}" ]]; then echo "defaulted_target=staging" >> "$GITHUB_ENV"; else echo "defaulted_target=${{ inputs.target }}" >> "$GITHUB_ENV"; fi
-      - name: Run E2E tests
-        uses: ./.github/actions/e2e
-        with:
-          version: ${{ inputs.version || github.ref }}
-          target: ${{ env.defaulted_target }}
-          total_shards: ${{ matrix.total_shards }}
-          current_shard: ${{ matrix.shard }}
-          playwright_tags_invert: "@auth"
-          staging_test_user_email: ${{ secrets.STAGING_TEST_USER_EMAIL }}
-          staging_test_user_password: ${{ secrets.STAGING_TEST_USER_PASSWORD }}
-          staging_test_user_mfa_key: ${{ secrets.STAGING_TEST_USER_MFA_KEY }}
-          report_name_prefix: blob-report-no-auth
-
-  e2e-tests-auth-single-worker:
-    name: Run Auth E2E Tests
+  e2e-tests-deployed:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository
@@ -65,21 +38,19 @@ jobs:
           target: ${{ env.defaulted_target }}
           total_shards: 1
           current_shard: 1
-          playwright_tags: "@auth"
+          workers: 1
+          playwright_tags: ${{ inputs.playwright_tags }}
           staging_test_user_email: ${{ secrets.STAGING_TEST_USER_EMAIL }}
           staging_test_user_password: ${{ secrets.STAGING_TEST_USER_PASSWORD }}
           staging_test_user_mfa_key: ${{ secrets.STAGING_TEST_USER_MFA_KEY }}
-          report_name_prefix: blob-report-auth
-
   create-report:
     name: Create Merged Test Report
     if: ${{ !cancelled() }}
-    needs: [e2e-tests-no-auth-sharded, e2e-tests-auth-single-worker]
+    needs: e2e-tests-deployed
     uses: ./.github/workflows/e2e-create-report.yml
     secrets: inherit
     with:
       run_id: ${{ github.run_id }}
-
   send-slack-notification:
     if: failure()
     needs: [create-report]

frontend/tests/e2e/apply/failure-path-sf424b.spec.ts

@@ -24,37 +24,33 @@ const sf424bErrors = [
   },
 ];
 
-test(
-  "SF-424B error validation - required fields and inline errors",
-  { tag: "@auth" },
-  async (
-    { page, context }: { page: Page; context: BrowserContext },
-    testInfo: TestInfo,
-  ) => {
-    test.setTimeout(300_000); // 5 min timeout
-
-    const isMobile = testInfo.project.name.match(/[Mm]obile/);
-
-    await authenticateE2eUser(page, context, !!isMobile);
-
-    await createApplication(page, OPPORTUNITY_URL, testOrgLabel);
-    const applicationUrl = page.url();
-
-    if (await openForm(page, SF424B_FORM_MATCHER)) {
-      // Do not enter anything and click save
-      await saveForm(page, true); // expect validation errors
-
-      // Checks error alert list at top of form page
-      // Scrolls down and checks inline field errors on form page
-      // Navigates to application landing page
-      // Scrolls down and checks "Some issues found" in form row
-      await verifyFormStatusAfterSave(
-        page,
-        "incomplete",
-        "SF-424B",
-        applicationUrl,
-        sf424bErrors,
-      );
-    }
-  },
-);
+test("SF-424B error validation - required fields and inline errors", async ({
+  page,
+  context,
+}: { page: Page; context: BrowserContext }, testInfo: TestInfo) => {
+  test.setTimeout(300_000); // 5 min timeout
+
+  const isMobile = testInfo.project.name.match(/[Mm]obile/);
+
+  await authenticateE2eUser(page, context, !!isMobile);
+
+  await createApplication(page, OPPORTUNITY_URL, testOrgLabel);
+  const applicationUrl = page.url();
+
+  if (await openForm(page, SF424B_FORM_MATCHER)) {
+    // Do not enter anything and click save
+    await saveForm(page, true); // expect validation errors
+
+    // Checks error alert list at top of form page
+    // Scrolls down and checks inline field errors on form page
+    // Navigates to application landing page
+    // Scrolls down and checks "Some issues found" in form row
+    await verifyFormStatusAfterSave(
+      page,
+      "incomplete",
+      "SF-424B",
+      applicationUrl,
+      sf424bErrors,
+    );
+  }
+});

frontend/tests/e2e/apply/fill-sflll-form.spec.ts

@@ -11,7 +11,7 @@ import { fillForm } from "tests/e2e/utils/forms/general-forms-filling";
 import {
   clearPageState,
   ensurePageClosed,
-} from "tests/e2e/utils/lifecycle-helpers";
+} from "tests/e2e/utils/lifecycle-utils";
 
 const { baseUrl, testOrgLabel, opportunityId } = playwrightEnv;
 const OPPORTUNITY_URL = `/opportunity/${opportunityId}`;
@@ -24,36 +24,30 @@ test.describe("fill SF-LLL Form", () => {
 
   test.setTimeout(120000);
 
-  test(
-    "should fill SFLLL form",
-    { tag: "@auth" },
-    async ({ page, context }, testInfo) => {
-      try {
-        await page.goto(`${baseUrl}${OPPORTUNITY_URL}`, {
-          waitUntil: "load",
-          timeout: 30000,
-        });
-
-        await createApplication(page, OPPORTUNITY_URL, testOrgLabel);
-
-        const sflllData = FORMS_TEST_DATA.sflll;
-
-        await fillForm(testInfo, page, {
-          formName: SFLLL_FORM_CONFIG.formName,
-          fields: getSflllFillFields(sflllData),
-          saveButtonTestId: SFLLL_FORM_CONFIG.saveButtonTestId,
-          returnToApplication: false,
-        });
-
-        await expect(
-          page.getByText(SFLLL_FORM_CONFIG.noErrorsText),
-        ).toBeVisible({
-          timeout: 15000,
-        });
-      } finally {
-        await clearPageState(context);
-        await ensurePageClosed(page);
-      }
-    },
-  );
+  test("should fill SFLLL form", async ({ page, context }, testInfo) => {
+    try {
+      await page.goto(`${baseUrl}${OPPORTUNITY_URL}`, {
+        waitUntil: "load",
+        timeout: 30000,
+      });
+
+      await createApplication(page, OPPORTUNITY_URL, testOrgLabel);
+
+      const sflllData = FORMS_TEST_DATA.sflll;
+
+      await fillForm(testInfo, page, {
+        formName: SFLLL_FORM_CONFIG.formName,
+        fields: getSflllFillFields(sflllData),
+        saveButtonTestId: SFLLL_FORM_CONFIG.saveButtonTestId,
+        returnToApplication: false,
+      });
+
+      await expect(page.getByText(SFLLL_FORM_CONFIG.noErrorsText)).toBeVisible({
+        timeout: 15000,
+      });
+    } finally {
+      await clearPageState(context);
+      await ensurePageClosed(page);
+    }
+  });
 });

frontend/tests/e2e/apply/happy-path-application-submission.spec.ts

@@ -22,55 +22,46 @@ const OPPORTUNITY_ID = "f7a1c2b3-4d5e-6789-8abc-1234567890ab"; // TEST-APPLY-ORG
 const OPPORTUNITY_URL = `/opportunity/${OPPORTUNITY_ID}`;
 
 // Added @auth tag to login-dependent tests so workflows can select them automatically.
-test(
-  "Application submission happy path - application with required SF424B and unsubmitted conditional SFLLL",
-  { tag: "@auth" },
-  async (
-    { page, context }: { page: Page; context: BrowserContext },
-    testInfo: TestInfo,
-  ) => {
-    test.setTimeout(300_000); // 5 min timeout
+test("Application submission happy path - application with required SF424B and unsubmitted conditional SFLLL", async ({
+  page,
+  context,
+}: { page: Page; context: BrowserContext }, testInfo: TestInfo) => {
+  test.setTimeout(300_000); // 5 min timeout
 
-    const isMobile = testInfo.project.name.match(/[Mm]obile/);
+  const isMobile = testInfo.project.name.match(/[Mm]obile/);
 
-    await authenticateE2eUser(page, context, !!isMobile);
+  await authenticateE2eUser(page, context, !!isMobile);
 
-    // Call reusable create application function from utils
-    await createApplication(page, OPPORTUNITY_URL, testOrgLabel);
-    const applicationUrl = page.url();
+  // Call reusable create application function from utils
+  await createApplication(page, OPPORTUNITY_URL, testOrgLabel);
+  const applicationUrl = page.url();
 
-    if (!(await openForm(page, SF424B_FORM_MATCHER))) {
-      throw new Error(
-        "Could not find or open SF-424B form link on the application forms page",
-      );
-    }
+  if (!(await openForm(page, SF424B_FORM_MATCHER))) {
+    throw new Error(
+      "Could not find or open SF-424B form link on the application forms page",
+    );
+  }
 
-    // Fill SF-424B form fields using helper
-    await fillSf424bForm(page, "TESTER", testOrgLabel);
+  // Fill SF-424B form fields using helper
+  await fillSf424bForm(page, "TESTER", testOrgLabel);
 
-    // Save the form using helper
-    await saveForm(page);
+  // Save the form using helper
+  await saveForm(page);
 
-    // Verify form status after save
-    await verifyFormStatusAfterSave(
-      page,
-      "complete",
-      "SF-424B",
-      applicationUrl,
-    );
+  // Verify form status after save
+  await verifyFormStatusAfterSave(page, "complete", "SF-424B", applicationUrl);
 
-    // Extra wait for page to fully render forms table after navigation
-    await page.waitForTimeout(10000);
+  // Extra wait for page to fully render forms table after navigation
+  await page.waitForTimeout(10000);
 
-    // Select 'No' for including SF-LLL form in submission
-    await selectFormInclusionOption(
-      page,
-      "Disclosure of Lobbying Activities (SF-LLL)",
-      "No",
-    );
+  // Select 'No' for including SF-LLL form in submission
+  await selectFormInclusionOption(
+    page,
+    "Disclosure of Lobbying Activities (SF-LLL)",
+    "No",
+  );
 
-    // Submit the application and verify success
-    await submitApplicationAndVerify(page);
-    // Application ID is now available in appId variable for further use if needed
-  },
-);
+  // Submit the application and verify success
+  await submitApplicationAndVerify(page);
+  // Application ID is now available in appId variable for further use if needed
+});