Adjust tests

Author: raub

.github/workflows/test.yml

@@ -42,14 +42,11 @@ jobs:
       - name: Run Unit Tests - Linux
         if: matrix.os == 'ubuntu-22.04'
         run: |
-          patchelf --force-rpath --set-rpath '$ORIGIN:$ORIGIN/../node_modules/deps-qt-core-raub/bin-linux:$ORIGIN/../node_modules/deps-qt-gui-raub/bin-linux:$ORIGIN/../node_modules/deps-qt-qml-raub/bin-linux:$ORIGIN/../../deps-qt-core-raub/bin-linux:$ORIGIN/../../deps-qt-gui-raub/bin-linux:$ORIGIN/../../deps-qt-qml-raub/bin-linux' $GITHUB_WORKSPACE/node_modules/deps-qmlui-raub/bin-linux/libqmlui.so
-          sudo apt-get update
+          # patchelf --force-rpath --set-rpath '$ORIGIN:$ORIGIN/../node_modules/deps-qt-core-raub/bin-linux:$ORIGIN/../node_modules/deps-qt-gui-raub/bin-linux:$ORIGIN/../node_modules/deps-qt-qml-raub/bin-linux:$ORIGIN/../../deps-qt-core-raub/bin-linux:$ORIGIN/../../deps-qt-gui-raub/bin-linux:$ORIGIN/../../deps-qt-qml-raub/bin-linux' $GITHUB_WORKSPACE/node_modules/deps-qmlui-raub/bin-linux/libqmlui.so
+          sudo apt-get update -qq
           sudo apt-get install -qq libgles2-mesa-dev libxcb-cursor0 libxcb-icccm4 libxcb-keysyms1 libxcb-shape0 libxcb-xkb1 libxkbcommon-x11-0
-          # LD_DEBUG=libs node .
-          # export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GITHUB_WORKSPACE/ci
-          LD_DEBUG=libs xvfb-run --auto-servernum npm run test-ci
-          # cd test && LD_DEBUG=libs xvfb-run --auto-servernum node debug.js
-          # xvfb-run --auto-servernum npm run test-ci
+          # LD_DEBUG=libs xvfb-run --auto-servernum npm run test-ci
+          xvfb-run --auto-servernum npm run test-ci
 
       # - name: Run Unit Tests - MacOS
       #   if: matrix.os == 'macos-14'

package.json

@@ -5,6 +5,7 @@
 	"description": "QML interoperation for Node.js",
 	"license": "MIT",
 	"main": "index.js",
+	"type": "commonjs",
 	"keywords": [
 		"addon",
 		"qml",

test/method.test.js

@@ -8,6 +8,10 @@ const { View, Method } = require('./init');
 
 
 const view = new View({ file: 'test.qml', silent: true });
+const loadPromise = Promise.race([
+	new Promise((res) => { setTimeout(() => res(false), 5000); }),
+	new Promise((res) => view.on('load', () => res(true))),
+]);
 view.on('error', () => {});
 
 const opts = { view, name: 'obj1', key: 'method1' };
@@ -26,6 +30,9 @@ const tested = describe('Method', () => {
 	});
 
 	it('calls QML method1', async () => {
+		const loaded = await loadPromise;
+		assert.strictEqual(loaded, true);
+		
 		const method1 = new Method(opts);
 		const called = await new Promise((res) => {
 			view.on('m1c', () => res(true));
@@ -35,6 +42,9 @@ const tested = describe('Method', () => {
 	});
 
 	it('calls QML method2', async () => {
+		const loaded = await loadPromise;
+		assert.strictEqual(loaded, true);
+		
 		const method2 = new Method({ ...opts, key: 'method2' });
 		const called = await new Promise((res) => {
 			view.on('m2c', () => res(true));
@@ -43,12 +53,18 @@ const tested = describe('Method', () => {
 		assert.strictEqual(called, true);
 	});
 
-	it('calls non-existent object\'s method, and gets null', () => {
+	it('calls non-existent object\'s method, and gets null', async () => {
+		const loaded = await loadPromise;
+		assert.strictEqual(loaded, true);
+		
 		const method = new Method({ ...opts, name: 'awdaldaklwd23' });
 		assert.strictEqual(method(), null);
 	});
 
-	it('calls non-existent method, and gets null', () => {
+	it('calls non-existent method, and gets null', async () => {
+		const loaded = await loadPromise;
+		assert.strictEqual(loaded, true);
+		
 		const method = new Method({ ...opts, key: 'awdaldaklwd23' });
 		assert.strictEqual(method(), null);
 	});

test/property.test.js

@@ -8,7 +8,10 @@ const { View, Property } = require('./init');
 
 
 const view = new View({ file: 'test.qml', silent: true });
-const loadPromise = new Promise((res) => view.on('load', () => res(true)));
+const loadPromise = Promise.race([
+	new Promise((res) => { setTimeout(() => res(false), 5000); }),
+	new Promise((res) => view.on('load', () => res(true))),
+]);
 view.on('error', () => {});
 
 const opts = { view, name: 'obj1', key: 'prop1' };
@@ -27,13 +30,15 @@ const tested = describe('Property', () => {
 	});
 
 	it('reads a value from QML', async () => {
-		await loadPromise;
+		const loaded = await loadPromise;
+		assert.strictEqual(loaded, true);
 		const prop = new Property(opts);
 		assert.strictEqual(prop.value, 'value1');
 	});
 
 	it('changes a QML value', async () => {
-		await loadPromise;
+		const loaded = await loadPromise;
+		assert.strictEqual(loaded, true);
 		const prop = new Property(opts);
 		const changed = await new Promise((res) => {
 			view.on('p1c', () => res(true));
@@ -43,13 +48,15 @@ const tested = describe('Property', () => {
 	});
 
 	it('reads non-existent object\'s property as null', async () => {
-		await loadPromise;
+		const loaded = await loadPromise;
+		assert.strictEqual(loaded, true);
 		const prop = new Property({ ...opts, name: 'awdaldaklwd23' });
 		assert.strictEqual(prop.value, null);
 	});
 
 	it('reads non-existent property as null', async () => {
-		await loadPromise;
+		const loaded = await loadPromise;
+		assert.strictEqual(loaded, true);
 		const prop = new Property({ ...opts, key: 'awdaldaklwd23' });
 		assert.strictEqual(prop.value, null);
 	});

test/view.test.js

@@ -19,8 +19,15 @@ const methods = [
 const staticMethods = ['init', 'libs', 'plugins', 'style', 'update'];
 
 const view = new View({ file: 'test.qml' });
-const loadPromise = new Promise((res) => view.on('load', () => res(true)));
-const texturePromise = new Promise((res) => view.on('reset', (id) => res(id)));
+const loadPromise = Promise.race([
+	new Promise((res) => { setTimeout(() => res(false), 5000); }),
+	new Promise((res) => view.on('load', () => res(true))),
+]);
+const texturePromise = Promise.race([
+	new Promise((res) => { setTimeout(() => res(null), 5000); }),
+	new Promise((res) => view.on('reset', (id) => res(id))),
+]);
+
 
 const tested = describe('Qml View', () => {
 	it('has all static methods', () => {