From 331fc57ada1f8d21aa3bb57da70b7a79f6dfee43 Mon Sep 17 00:00:00 2001
From: Seth Akins <sethlinc4@gmail.com>
Date: Mon, 22 Jan 2024 16:46:54 -0800
Subject: [PATCH] Changed which cypress command is used to run tests

---
 .github/workflows/e2e_tests_preview.yml | 122 ++++++++++++------------
 1 file changed, 63 insertions(+), 59 deletions(-)

diff --git a/.github/workflows/e2e_tests_preview.yml b/.github/workflows/e2e_tests_preview.yml
index 4209cb04..2bddd92a 100644
--- a/.github/workflows/e2e_tests_preview.yml
+++ b/.github/workflows/e2e_tests_preview.yml
@@ -93,75 +93,79 @@ jobs:
             - name: Migrate Database
               run: npx prisma migrate deploy
 
-#    cypress-e2e:
-#        name: Run Cypress E2E Tests on Preview Deployment
-#        runs-on: ubuntu-latest
-#        needs: [ deploy-preview, setup-db]
-#        steps:
-#            - uses: actions/checkout@v4
-#            - name: Write environment variables
-#              run: |
-#                  echo "${{ secrets.STAGING_ENV_FILE }}" > .env
-#            - name: Install Packages
-#              run: |
-#                  npm ci
-#            - name: Generate Prisma
-#              run: |
-#                  npx prisma generate
-#            - name: Run Cypress Tests
-#              run: |
-#                  npx cypress run
-
     cypress-e2e:
-        name: Run cypress E2E tests on preview deployment
+        name: Run Cypress E2E Tests on Preview Deployment
         runs-on: ubuntu-latest
-#        needs: [ deploy-preview, setup-db ]
-#        outputs:
-#            PR_ID: ${{ steps.save-cypress-outputs.outputs.PR_ID }}
+        needs: [ deploy-preview, setup-db]
         steps:
-            -   uses: actions/checkout@v4
-            -   name: Write environment variables
-                run: |
-                    echo "${{ secrets.STAGING_ENV_FILE }}" > .env
+            - uses: actions/checkout@v4
+            - name: Write environment variables
+              run: |
+                  echo "${{ secrets.STAGING_ENV_FILE }}" > .env
             - name: Install Packages
               run: |
                   npm ci
             - name: Generate Prisma
               run: |
-                    npx prisma generate
-            -   name: Cypress Run E2E Tests
-                uses: cypress-io/github-action@v6
-#                env:
-#                    GITHUB_TOKEN: ${{ secrets.PERSONAL_GITHUB_ACCESS_TOKEN }}
-                with:
-                    browser: chrome
-                    headed: true
-#            -   name: Upload screenshots
-#                uses: actions/upload-artifact@v4
-#                if: failure()
-#                with:
-#                    name: cypress-screenshots
-#                    path: cypress/screenshots
-#                    if-no-files-found: ignore
-#            -   name: Upload videos
-#                uses: actions/upload-artifact@v3
-#                if: failure()
-#                with:
-#                    name: cypress-videos
-#                    path: cypress/videos
-#                    if-no-files-found: ignore
-#            -   name: Save cypress outputs
-#                if: always()
-#                id: save-cypress-outputs
+                  npx prisma generate
+            - name: Run Cypress Tests
+              run: |
+                  npx cypress run
+            - name: See results
+              run: |
+                cd cypress
+                ls
+
+#    cypress-e2e:
+#        name: Run cypress E2E tests on preview deployment
+#        runs-on: ubuntu-latest
+##        needs: [ deploy-preview, setup-db ]
+##        outputs:
+##            PR_ID: ${{ steps.save-cypress-outputs.outputs.PR_ID }}
+#        steps:
+#            -   uses: actions/checkout@v4
+#            -   name: Write environment variables
 #                run: |
-#                    echo "PR_ID=$CYPRESS_PULL_REQUEST_ID" >> $GITHUB_OUTPUT
-#            -   name: Upload test results
-#                if: always()
-#                uses: actions/upload-artifact@v3
+#                    echo "${{ secrets.STAGING_ENV_FILE }}" > .env
+#            - name: Install Packages
+#              run: |
+#                  npm ci
+#            - name: Generate Prisma
+#              run: |
+#                    npx prisma generate
+#            -   name: Cypress Run E2E Tests
+#                uses: cypress-io/github-action@v6
+##                env:
+##                    GITHUB_TOKEN: ${{ secrets.PERSONAL_GITHUB_ACCESS_TOKEN }}
 #                with:
-#                    name: e2e-test-results
-#                    path: cypress/reports/e2e/e2e*.json
-#
+#                    browser: chrome
+#                    headed: true
+##            -   name: Upload screenshots
+##                uses: actions/upload-artifact@v4
+##                if: failure()
+##                with:
+##                    name: cypress-screenshots
+##                    path: cypress/screenshots
+##                    if-no-files-found: ignore
+##            -   name: Upload videos
+##                uses: actions/upload-artifact@v3
+##                if: failure()
+##                with:
+##                    name: cypress-videos
+##                    path: cypress/videos
+##                    if-no-files-found: ignore
+##            -   name: Save cypress outputs
+##                if: always()
+##                id: save-cypress-outputs
+##                run: |
+##                    echo "PR_ID=$CYPRESS_PULL_REQUEST_ID" >> $GITHUB_OUTPUT
+##            -   name: Upload test results
+##                if: always()
+##                uses: actions/upload-artifact@v3
+##                with:
+##                    name: e2e-test-results
+##                    path: cypress/reports/e2e/e2e*.json
+##
 #    results-report:
 #        name: Report results
 #        runs-on: ubuntu-latest