Merge pull request #6 from stagas/coverage

test: improve coverage

.github/workflows/deploy.yml

@@ -23,27 +23,30 @@ jobs:
         with:
           deno-version: v1.x
 
+      - name: Install Bun
+        uses: oven-sh/setup-bun@v1
+
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: lts/*
+          node-version: 22.x
 
-      - name: Install step
+      - name: Install dependencies
         run: npm install --ignore-scripts
 
-      - name: Build step
-        run: npm run build
+      - name: Build
+        run: bun run build
 
       - name: Generate .env file
         uses: SpicyPizza/[email protected]
         with:
           envkey_DATABASE_URL: ${{ secrets.DATABASE_URL }}
 
       - name: Run migrations
-        run: npm run kysely -- migrate:latest
+        run: bun run kysely -- migrate:latest
 
       - name: Run tests
-        run: npm run test:ci:npm
+        run: bun run test
 
       - name: Upload coverage deno
         uses: codecov/codecov-action@v4

.github/workflows/pr.yml

@@ -43,27 +43,30 @@ jobs:
         with:
           deno-version: v1.x
 
+      - name: Install Bun
+        uses: oven-sh/setup-bun@v1
+
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: lts/*
+          node-version: 22.x
 
-      - name: Install modules
+      - name: Install dependencies
         run: npm install --ignore-scripts
 
-      - name: Build step
-        run: npm run build
+      - name: Build
+        run: bun run build
 
       - name: Generate .env file
         uses: SpicyPizza/[email protected]
         with:
           envkey_DATABASE_URL: ${{ env.DATABASE_URL }}
 
       - name: Run migrations
-        run: npm run kysely -- migrate:latest
+        run: bun run kysely -- migrate:latest
 
       - name: Run tests
-        run: npm run test:ci:npm
+        run: bun run test
 
       - name: Upload coverage deno
         uses: codecov/codecov-action@v4

README.md

@@ -49,7 +49,7 @@
   - [x] Coverage
   - [x] Unit
   - [ ] Integration
-  - [ ] E2E
+  - [x] E2E
 - [x] HMR
 - [x] RPC
 - [x] Admin

api/import-map.production.json

@@ -1,8 +1,4 @@
 {
-  "fmt": {
-    "singleQuote": true,
-    "semiColons": false
-  },
   "imports": {
     "kysely": "npm:kysely@^0.27.4",
     "pg": "npm:pg",

bunfig.toml

@@ -0,0 +1,4 @@
+[test]
+preload = "./happydom.ts"
+coverageSkipTestFiles = true
+coverageReporter = ["text", "lcov"]

happydom.ts

@@ -0,0 +1,3 @@
+import { GlobalRegistrator } from "@happy-dom/global-registrator"
+
+GlobalRegistrator.register({ url: 'https://localhost' })

package.json

@@ -8,17 +8,15 @@
   "main": "src/client.tsx",
   "scripts": {
     "build": "vite build",
-    "test": "pnpm test:api && pnpm test:web",
-    "test:ci": "pnpm test:api:ci && pnpm test:web",
-    "test:ci:npm": "npm run test:api:ci && npm run test:web",
-    "test:watch": "pnpm test:api:watch & pnpm test:web:watch",
+    "test": "bun run test:api && bun run test:web",
+    "test:watch": "bun run test:api:watch & bun run test:web:watch",
     "test:api": "deno test -A --no-lock api",
     "test:api:ci": "deno test -A --no-lock --import-map=./api/import-map.production.json --coverage=coverage/deno api",
     "test:api:cov": "deno coverage coverage/deno --lcov --output=coverage/lcov-deno.info",
     "test:api:watch": "deno test -A --watch --no-lock api & deno -A --no-lock api/test-watch.ts",
-    "test:web": "vitest run --coverage",
-    "test:web:watch": "vitest --coverage",
-    "dev": "pnpm dev:db & pnpm dev:api & pnpm dev:web",
+    "test:web": "bun test --coverage src",
+    "test:web:watch": "bun test --coverage --watch src",
+    "dev": "bun run dev:db & bun run dev:api & bun run dev:web",
     "dev:db": "docker compose up",
     "dev:api": "deno --watch --unstable-kv -A api/core/server.ts",
     "dev:web": "vite",
@@ -27,9 +25,10 @@
     "postinstall": "link-local || exit 0"
   },
   "devDependencies": {
+    "@happy-dom/global-registrator": "^15.7.4",
     "@maktouch/kysely-zod-codegen": "^0.5.2",
+    "@types/bun": "^1.1.10",
     "@types/node": "^22.7.4",
-    "@vitest/coverage-v8": "^2.1.2",
     "ambient-dts": "github:stagas/ambient-dts",
     "autoprefixer": "^10.4.20",
     "jsdom": "^25.0.1",
@@ -39,8 +38,7 @@
     "postcss": "^8.4.47",
     "tailwindcss": "^3.4.13",
     "utils": "github:stagas/utils",
-    "vite": "^5.4.8",
-    "vitest": "^2.1.1"
+    "vite": "^5.4.8"
   },
   "dependencies": {
     "@types/pg": "^8.11.10",

src/test/e2e.test.tsx

@@ -0,0 +1,37 @@
+import { App } from '../pages/App.tsx'
+import { state } from '../state.ts'
+
+// @ts-ignore
+globalThis.fetch = () => {
+  return { json: () => { } }
+}
+
+describe('App', () => {
+  it('works', () => {
+    const app = <App />
+    expect(app).toBeInstanceOf(Element)
+  })
+
+  it('routes', async () => {
+    const app = <App />
+    expect(app).toBeInstanceOf(Element)
+    state.url = new URL('/about', location.origin)
+    state.url = new URL('/verify-email', location.origin)
+    state.url = new URL('/reset-password', location.origin)
+  })
+
+  it('user', async () => {
+    const app = <App />
+    expect(app).toBeInstanceOf(Element)
+    state.user = null
+    state.user = {
+      nick: 'foo',
+      expires: new Date(),
+    }
+    state.user = {
+      nick: 'foo',
+      expires: new Date(),
+      isAdmin: true
+    }
+  })
+})

vite.config.ts

@@ -1,5 +1,3 @@
-/// <reference types="vitest" />
-
 import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
@@ -19,22 +17,6 @@ export default ({ mode }) => {
   } : undefined
   return defineConfig({
     clearScreen: false,
-    test: {
-      globals: true,
-      dir: 'src',
-      includeSource: ['src/**/*.{js,jsx,ts,tsx}'],
-      environment: 'jsdom',
-      coverage: {
-        clean: false,
-        cleanOnRerun: false,
-        include: ['src'],
-        reporter: ['lcovonly'],
-        reportsDirectory: 'coverage'
-      }
-    },
-    define: {
-      'import.meta.vitest': 'undefined',
-    },
     server: {
       host: true,
       fs: {