Revert "Attempt to factor our E2E"

This reverts commit 6f20560.
techmatters · Sep 2, 2022 · c450b22 · c450b22
1 parent a7f5f6f
commit c450b22
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 65 deletions.
diff --git a/.github/actions/e2e-test-execution/action.yml b/.github/actions/e2e-test-execution/action.yml
diff --git a/.github/workflows/plugin-hrm-form-pre-release-qa.yml b/.github/workflows/plugin-hrm-form-pre-release-qa.yml
@@ -38,37 +38,29 @@ jobs:
           aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
           send-slack-message: false
 
-      # # Build Playwright
-      # - name: Install e2e-tests dependencies
-      #   run: npm install
-      #   working-directory: ./e2e-tests
-      # - name: Setup dependencies for playwright/browsers
-      #   uses: microsoft/playwright-github-action@v1
-      # - name: Install Playwright CLI
-      #   run: npx playwright install
-      #   working-directory: ./e2e-tests
+      # Build Playwright
+      - name: Install e2e-tests dependencies
+        run: npm install
+        working-directory: ./e2e-tests
+      - name: Setup dependencies for playwright/browsers
+        uses: microsoft/playwright-github-action@v1
+      - name: Install Playwright CLI
+        run: npx playwright install
+        working-directory: ./e2e-tests
 
-      # # Run E2E tests against actual E2E Flex instance
-      # - name: Run Playwright tests
-      #   run: DEBUG=pw:api PLAYWRIGHT_BASEURL=${{secrets.PLAYWRIGHT_BASEURL_E2E}} PLAYWRIGHT_USER_USERNAME=${{secrets.PLAYWRIGHT_USER_USERNAME}} PLAYWRIGHT_USER_PASSWORD=${{secrets.PLAYWRIGHT_USER_PASSWORD}} TWILIO_ACCOUNT_SID=${{secrets.E2E_DEV_ACCOUNT_SID}} TWILIO_AUTH_TOKEN=${{secrets.E2E_DEV_AUTH_TOKEN}} npx playwright test
-      #   working-directory: ./e2e-tests
+      # Run E2E tests against actual E2E Flex instance
+      - name: Run Playwright tests
+        run: DEBUG=pw:api PLAYWRIGHT_BASEURL=${{secrets.PLAYWRIGHT_BASEURL_E2E}} PLAYWRIGHT_USER_USERNAME=${{secrets.PLAYWRIGHT_USER_USERNAME}} PLAYWRIGHT_USER_PASSWORD=${{secrets.PLAYWRIGHT_USER_PASSWORD}} TWILIO_ACCOUNT_SID=${{secrets.E2E_DEV_ACCOUNT_SID}} TWILIO_AUTH_TOKEN=${{secrets.E2E_DEV_AUTH_TOKEN}} npx playwright test
+        working-directory: ./e2e-tests
 
-      # # Upload artifacts
-      # - uses: actions/upload-artifact@v2
-      #   if: ${{ always() }}
-      #   with:
-      #     name: test-artifacts
-      #     path: e2e-tests/test-results
-
-      # Run E2E tests
-      - name: Run E2E tests
-        uses: ./.github/actions/e2e-test-execution
+      # Upload artifacts
+      - uses: actions/upload-artifact@v2
+        if: ${{ always() }}
         with:
-          PLAYWRIGHT_BASEURL_E2E: ${{ secrets.PLAYWRIGHT_BASEURL_E2E }}
-          PLAYWRIGHT_USER_USERNAME: ${{ secrets.PLAYWRIGHT_USER_USERNAME }}
-          PLAYWRIGHT_USER_PASSWORD: ${{ secrets.PLAYWRIGHT_USER_PASSWORD }}
-          E2E_DEV_ACCOUNT_SID: ${{ secrets.E2E_DEV_ACCOUNT_SID }}
-          E2E_DEV_AUTH_TOKEN: ${{ secrets.E2E_DEV_AUTH_TOKEN }}
+          name: test-artifacts
+          path: e2e-tests/test-results
+
+      ## TODO: test if this is aborted if E2E tests fails
 
       # Get latest tag for this version
       - name: Get latest tag