Merge branch 'main' into cypress

haliphax · Jan 24, 2025 · 9caf677 · 9caf677
2 parents 298abf1 + 4ad8907
commit 9caf677
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/.github/action.yml b/.github/action.yml
@@ -22,5 +22,5 @@ runs:
         cache: npm
 
     - name: Install dependencies
-      run: npm ci --ignore-scripts
+      run: npm ci
       shell: bash
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -35,24 +35,19 @@ jobs:
           PR_TITLE: ${{ github.event.pull_request.title }}
         run: echo "$PR_TITLE" | npx commitlint
 
-  docker:
-    name: Docker build
+  e2e:
+    name: End-to-end tests
     runs-on: ubuntu-latest
     steps:
       - uses: haliphax/narf/.github@main
 
       - name: Docker build
-        run: docker build -t narf .
-
-  end-to-end:
-    name: End-to-end tests
-    runs-on: ubuntu-latest
-    steps:
-      - uses: haliphax/narf/.github@main
+        run: docker build -t narf:latest .
 
-      - name: End-to-end tests
+      - name: Cypress
         run: |
-          npm run start &
+          mkdir db
+          docker run -d -p 3000:3000 -v $(pwd)/db:/app/db narf:latest
           npm run e2e
 
   eslint:

diff --git a/cypress/e2e/story.cy.ts b/cypress/e2e/story.cy.ts
@@ -1,6 +1,6 @@
 describe("story spec", () => {
 	it("passes", () => {
-		cy.visit("http://localhost:3000")
+		cy.visit("http://localhost:3000", {})
 			.get("#title")
 			.should("be.visible")
 			.type("Test{enter}")