Revert "Turn off cypress tests for now" (#114)

Reverts #110 --------- Co-authored-by: astone123 <[email protected]>
wweitzel · Aug 26, 2024 · bb0939a · bb0939a
1 parent 4f10235
commit bb0939a
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -58,9 +58,51 @@ jobs:
           name: build
       - name: Run unit tests
         run: bun run test
+  cypress-tests:
+    name: E2E Tests
+    runs-on: ubuntu-latest
+    needs: build
+    env:
+      CYPRESS_RECORD_KEY: ${{ secrets.TOP90_CYPRESS_RECORD_KEY }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: 1.0.0
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+      - name: Restore cached dependencies
+        id: dependency-restore
+        uses: actions/cache/restore@v3
+        with:
+          path: node_modules/
+          key: ${{ runner.os }}-node-modules-${{ hashFiles('bun.lockb') }}
+      - name: Start app
+        run: bun start &
+      - name: Restore Cypress cache
+        id: cypress-restore
+        uses: actions/cache/restore@v3
+        with:
+          path: /home/runner/.cache/Cypress
+          key: ${{ runner.os }}-cypress-${{ hashFiles('bun.lockb') }}
+      - name: Install Cypress
+        run: bun cypress install
+      - name: Save Cypress cache
+        id: cypress-save
+        uses: actions/cache/save@v3
+        with:
+          path: /home/runner/.cache/Cypress
+          key: ${{ runner.os }}-cypress-${{ hashFiles('bun.lockb') }}
+      - name: Run Cypress e2e with record
+        if: ${{ env.CYPRESS_RECORD_KEY }}
+        run: bun cypress run --e2e --record
+      - name: Run Cypress e2e
+        if: ${{ !env.CYPRESS_RECORD_KEY }}
+        run: bun cypress run --e2e
   deploy:
     name: Deploy
-    needs: [build, jest-tests]
+    needs: [build, jest-tests, cypress-tests]
     if: github.ref_name == 'master'
     runs-on: ubuntu-latest
     steps:

diff --git a/e2e/e2e.ts b/e2e/e2e.ts
@@ -10,5 +10,8 @@ beforeEach(() => {
   cy.intercept('GET', `${Cypress.env('API_BASE_URL')}/fixtures*`, {fixture: 'fixtures'}).as(
     'fixtures'
   );
+  cy.intercept('GET', `${Cypress.env('API_BASE_URL')}/fixtures/*`, {fixture: 'fixture'}).as(
+    'fixture'
+  );
   cy.intercept('GET', `${Cypress.env('API_BASE_URL')}/goals*`, {fixture: 'goals'}).as('goals');
 });
diff --git a/e2e/fixtures.cy.ts b/e2e/fixtures.cy.ts
@@ -32,7 +32,7 @@ describe('fixtures', () => {
       expect(loc.pathname).to.eq('/fixtures/1049002');
     });
 
-    cy.wait(['@goals', '@goals']).then((interceptions) => {
+    cy.wait(['@goals', '@goals', '@fixture']).then((interceptions) => {
       const reqQuery = JSON.parse(interceptions[1].request.query.json as string);
       cy.wrap(reqQuery).its('filter').its('fixtureId').should('equal', 1049002);
     });

diff --git a/e2e/fixtures/fixture.json b/e2e/fixtures/fixture.json
@@ -0,0 +1,35 @@
+{
+  "fixture": {
+    "id": 1208518,
+    "referee": "",
+    "date": "2024-08-26T12:30:00-07:00",
+    "timestamp": 0,
+    "teams": {
+      "home": {
+        "id": 533,
+        "name": "Villarreal",
+        "aliases": null,
+        "code": "",
+        "country": "",
+        "founded": 0,
+        "national": false,
+        "logo": "https://media.api-sports.io/football/teams/533.png",
+        "createdAt": ""
+      },
+      "away": {
+        "id": 538,
+        "name": "Celta Vigo",
+        "aliases": null,
+        "code": "",
+        "country": "",
+        "founded": 0,
+        "national": false,
+        "logo": "https://media.api-sports.io/football/teams/538.png",
+        "createdAt": ""
+      }
+    },
+    "leagueId": 140,
+    "season": 2024,
+    "createdAt": "2024-08-18T15:28:13.30605Z"
+  }
+}