Separated tests for each package to have only darkroom use browser

Joery-M · Apr 15, 2024 · ec52f5e · ec52f5e
1 parent 04287de
commit ec52f5e
Show file tree

Hide file tree

Showing 13 changed files with 144 additions and 276 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,57 +4,57 @@
 name: Test
 
 on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["main"]
+    push:
+        branches: ['main']
+    pull_request:
+        branches: ['main']
 
 jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [20.12.0] # Latest LTS
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Install pnpm
-        uses: pnpm/action-setup@v3
-        with:
-          version: 8 # Latest major
-          run_install: false
-
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
-        with:
-          path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Build Darkroom
-        run: pnpm build:darkroom
-
-      - name: Build Timeline
-        run: pnpm build:timeline
-
-      - name: Build safelight
-        run: pnpm build:safelight
-
-      - name: Test
-        run: pnpm test:run
+    test:
+        runs-on: ubuntu-latest
+
+        strategy:
+            matrix:
+                node-version: [20.12.0] # Latest LTS
+
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Install Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: ${{ matrix.node-version }}
+
+            - name: Install pnpm
+              uses: pnpm/action-setup@v3
+              with:
+                  version: 8 # Latest major
+                  run_install: false
+
+            - name: Get pnpm store directory
+              shell: bash
+              run: |
+                  echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+            - uses: actions/cache@v3
+              name: Setup pnpm cache
+              with:
+                  path: ${{ env.STORE_PATH }}
+                  key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+                  restore-keys: |
+                      ${{ runner.os }}-pnpm-store-
+
+            - name: Install dependencies
+              run: pnpm install
+
+            - name: Build Darkroom
+              run: pnpm build:darkroom
+
+            - name: Build Timeline
+              run: pnpm build:timeline
+
+            - name: Build safelight
+              run: pnpm build:safelight
+
+            - name: Test
+              run: pnpm test
diff --git a/package.json b/package.json
@@ -11,8 +11,7 @@
         "build:darkroom": "cd packages/darkroom && pnpm build",
         "build:timeline": "cd packages/timeline && pnpm build",
         "build:safelight": "cd packages/safelight && pnpm build",
-        "test": "vitest",
-        "test:run": "vitest run --open false --ui false",
+        "test": "pnpm run -r test:run",
         "dev": "pnpm build:packages && cd packages/safelight && pnpm dev",
         "dev:darkroom": "pnpm build:packages && cd packages/darkroom && pnpm dev:web"
     },

diff --git a/packages/darkroom/package.json b/packages/darkroom/package.json
@@ -25,7 +25,8 @@
         "build": "rimraf ./dist/ && vite build && tsc --emitDeclarationOnly",
         "build:vite": "vite build",
         "build:tsc": "tsc --emitDeclarationOnly",
-        "test": "vitest"
+        "test": "vitest",
+        "test:run": "vitest run --ui false"
     },
     "dependencies": {
         "@endo/static-module-record": "^1.1.1",
@@ -57,4 +58,4 @@
         "vite-plugin-mkcert": "^1.17.5",
         "vue-codemirror": "^6.1.1"
     }
-}
+}
diff --git a/packages/darkroom/vitest.config.ts b/packages/darkroom/vitest.config.ts
@@ -4,6 +4,7 @@ export default defineProject({
     test: {
         reporters: !process.env.GITHUB_ACTIONS ? ['default', 'github-actions'] : ['default'],
         globals: true,
+        name: 'Darkroom',
         browser: {
             enabled: true,
             headless: true,

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -6,6 +6,10 @@
     "exports": {
         "./*": "./src/*.ts"
     },
+    "scripts": {
+        "test": "vitest",
+        "test:run": "vitest run --ui false"
+    },
     "dependencies": {
         "@vueuse/core": "^10.9.0",
         "@vueuse/shared": "^10.9.0",
@@ -23,6 +27,8 @@
         "@tsconfig/node20": "^20.1.4",
         "@types/luxon": "^3.4.2",
         "@types/uuid": "^9.0.8",
-        "@vue/tsconfig": "^0.5.1"
+        "@vue/tsconfig": "^0.5.1",
+        "fake-indexeddb": "^5.0.2",
+        "happy-dom": "^14.7.1"
     }
 }
diff --git a/packages/shared/src/Storage/db.ts b/packages/shared/src/Storage/db.ts
@@ -6,7 +6,13 @@ export class SafelightIndexedDB extends Dexie {
     project!: Table<StoredProject, string>;
 
     constructor() {
-        super('SafelightIdb');
+        // Only during tests
+        if (global?.vitest) {
+            super('SafelightIdb', { indexedDB: global.indexedDB, IDBKeyRange: global.IDBKeyRange });
+        } else {
+            super('SafelightIdb');
+        }
+
         this.version(1).stores({
             media: 'id, name, contentHash',
             project: 'id, name, type'

diff --git a/packages/shared/test/Storage/indexedDB/Project.spec.ts b/packages/shared/test/Storage/indexedDB/Project.spec.ts
@@ -0,0 +1,32 @@
+import { IDBKeyRange, indexedDB } from 'fake-indexeddb';
+import { expect, test } from 'vitest';
+import SimpleProject from '../../../src/Project/SimpleProject';
+import IndexedDbStorageController from '../../../src/Storage/IndexedDbStorage';
+
+test('List projects', async () => {
+    global.indexedDB = indexedDB;
+    global.IDBKeyRange = IDBKeyRange;
+
+    const storage = new IndexedDbStorageController();
+
+    const project = new SimpleProject();
+    await storage.SaveProject(project);
+
+    const projects = await storage.getProjects();
+
+    expect(projects[0].id).toBe(project.id);
+});
+
+test('Retrieve project', async () => {
+    global.indexedDB = indexedDB;
+    global.IDBKeyRange = IDBKeyRange;
+
+    const storage = new IndexedDbStorageController();
+
+    const project = new SimpleProject();
+    await storage.SaveProject(project);
+
+    const loadedProject = await storage.LoadProject(project.id);
+
+    expect(loadedProject?.id).toEqual(project.id);
+});
diff --git a/packages/shared/vitest.config.ts b/packages/shared/vitest.config.ts
@@ -6,14 +6,12 @@ export default defineProject({
     test: {
         reporters: !process.env.GITHUB_ACTIONS ? ['default', 'github-actions'] : ['default'],
         globals: true,
-        environment: 'jsdom',
+        environment: 'happy-dom',
+        name: 'shared',
         ui: true,
+        open: false,
         api: {
             port: 5125
-        },
-        browser: {
-            name: 'chrome',
-            enabled: false
         }
     }
 });
diff --git a/packages/timeline/package.json b/packages/timeline/package.json
@@ -27,7 +27,8 @@
         "build": "pnpm \"/build:/\"",
         "build:vite": "vite build",
         "build:tsc": "vue-tsc --emitDeclarationOnly",
-        "test": "vitest"
+        "test": "vitest",
+        "test:run": "vitest run --ui false"
     },
     "dependencies": {
         "@safelight/shared": "workspace:*",
@@ -42,10 +43,10 @@
         "@vitejs/plugin-vue": "^5.0.4",
         "@vue/test-utils": "^2.4.5",
         "@vue/tsconfig": "^0.5.1",
-        "jsdom": "^24.0.0",
+        "happy-dom": "^14.7.1",
         "typescript": "^5.4.5",
         "vite": "^5.2.8",
         "vitest": "^1.4.0",
         "vue-tsc": "^2.0.12"
     }
-}
+}
diff --git a/packages/timeline/vitest.config.ts b/packages/timeline/vitest.config.ts
@@ -6,7 +6,9 @@ export default defineProject({
     test: {
         reporters: !process.env.GITHUB_ACTIONS ? ['default', 'github-actions'] : ['default'],
         globals: true,
-        environment: 'jsdom',
-        ui: true
+        name: 'timeline',
+        environment: 'happy-dom',
+        ui: true,
+        open: false
     }
 });