Fix gh ci

Author: Polleps

.github/workflows/main.yml

@@ -1,12 +1,17 @@
-on: [push, workflow_dispatch]
+on:
+  [
+    push,
+    workflow_dispatch,
+  ]
 
-name: "Build, test, clippy"
+name: 'Build, test, clippy'
 jobs:
   fmt:
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
-      - run: |
+      - run:
+          |
           sudo apt-get update
           sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
       - uses: actions/checkout@v2
@@ -38,36 +43,42 @@ jobs:
 
       - name: Get pnpm store directory
         id: pnpm-cache
-        run: |
+        run:
+          |
           echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
 
       - uses: actions/cache@v3
         name: Setup pnpm cache
         with:
           path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
           key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
+          restore-keys:
+            |
             ${{ runner.os }}-pnpm-store-
 
       - name: Install JS deps
         working-directory: ./browser/
-        run: |
+        run:
+          |
           pnpm install
           pnpm run playwright-install
 
       - name: Lint JS
         working-directory: ./browser/
-        run: |
+        run:
+          |
           pnpm run lint
 
       - name: Test JS (no e2e)
         working-directory: ./browser/
-        run: |
+        run:
+          |
           pnpm run test
 
       - name: Build JS
         working-directory: ./browser/
-        run: |
+        run:
+          |
           pnpm run build
 
       - name: Save JS Build Artifacts
@@ -78,9 +89,13 @@ jobs:
   e2e:
     name: End-to-end tests
     runs-on: ubuntu-latest
-    needs: [build_js]
+    needs:
+      [
+        build_js,
+      ]
     steps:
-      - run: |
+      - run:
+          |
           sudo apt-get update
           sudo apt-get install -y webkit2gtk-4.0  libayatana-appindicator3-dev
       - uses: actions/checkout@v3
@@ -131,20 +146,23 @@ jobs:
 
       - name: Get pnpm store directory
         id: pnpm-cache
-        run: |
+        run:
+          |
           echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
 
       - uses: actions/cache@v3
         name: Setup pnpm cache
         with:
           path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
           key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
+          restore-keys:
+            |
             ${{ runner.os }}-pnpm-store-
 
       - name: Install Playwright
         working-directory: ./browser/
-        run: |
+        run:
+          |
           pnpm install
           pnpm run playwright-install
 
@@ -156,6 +174,7 @@ jobs:
         env:
           FRONTEND_URL: http://localhost:9883
           LANGUAGE: 'en_GB'
+          DELETE_PREVIOUS_TEST_DRIVES: 'false'
         run: pnpm run test-e2e
 
       # Coverage

browser/cli/package.json

@@ -2,7 +2,7 @@
   "version": "0.35.2",
   "author": "Polle Pas",
   "dependencies": {
-    "@tomic/lib": "^0.35.2",
+    "@tomic/lib": "workspace:*",
     "chalk": "^5.3.0",
     "prettier": "3.0.3"
   },
@@ -30,6 +30,6 @@
   },
   "type": "module",
   "peerDependencies": {
-    "@tomic/lib": "^0.35.2"
+    "@tomic/lib": "workspace:*"
   }
 }

browser/data-browser/tests/global.setup.ts

@@ -1,7 +1,18 @@
 import { test as setup, expect } from '@playwright/test';
-import { before, FRONTEND_URL, signIn } from './test-utils';
+import {
+  before,
+  DELETE_PREVIOUS_TEST_DRIVES,
+  FRONTEND_URL,
+  signIn,
+} from './test-utils';
 
 setup('delete previous test data', async ({ page }) => {
+  if (!DELETE_PREVIOUS_TEST_DRIVES) {
+    expect(true).toBe(true);
+
+    return;
+  }
+
   await before({ page });
   await signIn(page);
   await page.goto(`${FRONTEND_URL}/prunetests`);

browser/data-browser/tests/ontology.spec.ts

@@ -7,6 +7,8 @@ import {
   currentDialog,
 } from './test-utils';
 
+const WAIT_FOR_SEARCH_INDEX_TIME = 6000;
+
 test.describe('Ontology', async () => {
   test.beforeEach(before);
 
@@ -157,7 +159,7 @@ test.describe('Ontology', async () => {
 
     // Create arrow-kind instances
 
-    await page.waitForTimeout(5000);
+    await page.waitForTimeout(WAIT_FOR_SEARCH_INDEX_TIME);
 
     const createInstance = async (name: string) => {
       await page.getByRole('button', { name: 'New Instance' }).click();
@@ -180,7 +182,7 @@ test.describe('Ontology', async () => {
     await createInstance('Red arrow with circle');
     await createInstance('Green arrow with black border');
 
-    await page.waitForTimeout(5000);
+    await page.waitForTimeout(WAIT_FOR_SEARCH_INDEX_TIME);
 
     await page
       .getByRole('button', { name: 'add an item to the allows-only list' })

browser/data-browser/tests/test-utils.ts

@@ -2,6 +2,9 @@ import { Page, expect, Browser, Locator } from '@playwright/test';
 
 export const DEMO_FILENAME = 'testimage.svg';
 export const SERVER_URL = 'http://localhost:9883';
+export const DELETE_PREVIOUS_TEST_DRIVES =
+  process.env.DELETE_PREVIOUS_TEST_DRIVES === 'false' ? false : true;
+
 export const FRONTEND_URL = process.env.FRONTEND_URL || 'http://localhost:5173';
 // TODO: Should use an env var so the CI can test the setup test.
 export const INITIAL_TEST = false;
@@ -168,10 +171,8 @@ export async function fillSearchBox(
   await selector.getByPlaceholder(placeholder).type(fillText);
 
   return async (name: string) => {
-    // wait for the search to load (TODO: make this better)
-    await page.waitForTimeout(100);
-    selector.getByTestId('searchbox-results').getByText(name).hover();
-    selector.getByTestId('searchbox-results').getByText(name).click();
+    await selector.getByTestId('searchbox-results').getByText(name).hover();
+    await selector.getByTestId('searchbox-results').getByText(name).click();
   };
 }
 

browser/package.json

@@ -37,7 +37,7 @@
     "dev": "pnpm run start",
     "lint": "pnpm run -r lint",
     "lint-fix": "pnpm run -r lint-fix",
-    "build": "pnpm run -r build",
+    "build": "pnpm --filter \"@tomic/lib\" run build && pnpm --filter=!./lib run -r build ",
     "test": "pnpm run -r test",
     "test-e2e": "pnpm run --filter @tomic/data-browser test-e2e",
     "test-query": "pnpm run --filter @tomic/data-browser test-query",