From 6440845e6555c4a2ce462358b4361a9ce39b307f Mon Sep 17 00:00:00 2001
From: Mattk70 <email@mattkirkland.co.uk>
Date: Thu, 14 Nov 2024 13:42:30 +0000
Subject: [PATCH] let see if tests work at all

---
 .github/workflows/check-installation.yml |  5 +++
 js/worker.js                             |  1 +
 playwright.config.ts                     |  2 +-
 test/menu.spec.ts                        | 51 ++++++++++++++++++------
 4 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/check-installation.yml b/.github/workflows/check-installation.yml
index f1721a53..fa2e8c7d 100644
--- a/.github/workflows/check-installation.yml
+++ b/.github/workflows/check-installation.yml
@@ -159,3 +159,8 @@ jobs:
           fi
       - run: echo "File check status is ${{ job.status }}."
 
+      # Tests
+      - name: Test packaged application
+        run: npm test
+
+
diff --git a/js/worker.js b/js/worker.js
index 52e96fb2..2e8e2e7f 100644
--- a/js/worker.js
+++ b/js/worker.js
@@ -641,6 +641,7 @@ async function spawnListWorker() {
             
             if (message === 'list-model-ready') {
                 return resolve(worker);
+                
             } else if (message === "tfjs-node") {
                 STATE.hasNode = true;
                 if (!event.data.available) {
diff --git a/playwright.config.ts b/playwright.config.ts
index 154eece2..011f1df6 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -19,7 +19,7 @@ export default defineConfig({
     //channel: 'chrome',
 
     // Run browser in headless mode.
-    headless: false,
+    headless: true,
 
     // Change the default data-testid attribute.
     //testIdAttribute: 'pw-test-id',
diff --git a/test/menu.spec.ts b/test/menu.spec.ts
index b69243ee..196aef6e 100644
--- a/test/menu.spec.ts
+++ b/test/menu.spec.ts
@@ -14,9 +14,9 @@ import {
 import { ElectronApplication, Page } from 'playwright';
 import jimp from 'jimp';
 
-let electronApp: ElectronApplication = null;
-let page: Page = null;
-let worker: Page
+let electronApp: ElectronApplication;
+let page: Page;
+let worker: Page;
 let example_file: any
 
 test.beforeAll(async () => {
@@ -49,7 +49,7 @@ test.beforeAll(async () => {
        },
      },
    ])
-   worker = electronApp.firstWindow()
+   worker = await electronApp.firstWindow()
 
   electronApp.on('window', async (window) => {
     const filename = window.url()?.split('/').pop()
@@ -63,7 +63,7 @@ test.beforeAll(async () => {
       console.log(msg.text())
     })
   })
-  await new Promise((resolve) => { const checkPage = setInterval(() => { if (page) { clearInterval(checkPage); resolve(); } }, 100); });
+  await new Promise((resolve) => { const checkPage = setInterval(() => { if (page) { clearInterval(checkPage); resolve(); } }, 1000); });
 })
 
 test.afterAll(async () => {
@@ -71,6 +71,7 @@ test.afterAll(async () => {
   await electronApp.close()
 })
 
+test.describe.configure({ mode: 'parallel' });
 
 test('Page title is correct', async () => {
   const title = await page.title()
@@ -80,23 +81,51 @@ test('Page title is correct', async () => {
   expect(title).toBe('Chirpity Bird Call Detection')
 })
 
-
-test(`Analyse works`, async () => {
+async function openExampleFile(){
   await page.locator('#navBarFile').click()
   await page.locator('#open-file').click()
-  page.locator('wave').first().waitFor({state: 'visible'})
+  await page.locator('wave').first().waitFor({state: 'visible'})
+}
+
+async function changeSettings(elementID, value, timeout){
+  await  page.locator('#navbarSettings').click()
+  await page.selectOption('#' + elementID, value);
+  await page.locator('#close-settings').click();
+  // Wait ?
+  if (timeout) await page.waitForTimeout(timeout);
+}
+
+test(`Nocmig analyse works and second result is 61%`, async () => {
+  await openExampleFile();
+  await changeSettings('model-to-use', 'chirpity', 5000)
+  await  page.locator('#navbarAnalysis').click();
+  await page.locator('#analyse').click()
+  await  page.locator('#resultTableContainer').waitFor({state: 'visible'})
+  const callID = page.locator('#speciesFilter').getByText('Redwing (call)');
+  expect(callID).not.toBe(undefined)
+  const secondResult = await (await page.waitForSelector('#result2 span.confidence-row > span')).textContent()
+  // console.log(secondResult, 'second result');
+  expect(secondResult).toBe('61%');
+})
+
+test(`BirdNET analyse works and second result is 34%`, async () => {
+  await openExampleFile()
+  await changeSettings('model-to-use', 'birdnet', 5000)
+
   await  page.locator('#navbarAnalysis').click()
   await page.locator('#analyse').click()
   await  page.locator('#resultTableContainer').waitFor({state: 'visible'})
   const callID = page.locator('#speciesFilter').getByText('Redwing (call)');
   expect(callID).not.toBe(undefined)
+  const secondResult = await (await page.waitForSelector('#result2 span.confidence-row > span')).textContent()
+  // console.log(secondResult, 'second result');
+  expect(secondResult).toBe('34%');
 })
 
-//test.describe.configure({ mode: 'parallel' });
+
 
 test(`Audacity labels work`, async () => {
   
-  page = await electronApp.waitForEvent('window')
   // Everything shows 8 rows @ 45%
   await page.getByRole('button', { name: 'Settings' }).click();
   await page.getByLabel('Show:').selectOption('everything');
@@ -117,8 +146,6 @@ test(`Audacity labels work`, async () => {
 })
 
 test("Amend file start dialog contains date", async () =>{
-  
-  page = await electronApp.waitForEvent('window')
   await page.getByRole('button', { name: 'example.mp3' }).click({
     button: 'right'
   });