(#246) Restructured e2e tests to better verify updated dependencies

Author: s1hofmann

.github/workflows/ci.yaml

@@ -71,12 +71,15 @@ jobs:
         run: npm ci
       - name: Compile
         run: npm run compile
-      - name: Init e2e test subpackage
-        run: npm --prefix e2e/tests ci
+      - name: Init window e2e test subpackage
+        run: npm --prefix e2e/window-test ci
       - name: Generate coverage report
         uses: GabrielBB/xvfb-action@v1
         with:
           run: npm run coverage -- --coverageDirectory=coverage/unit
       - name: Run Docker E2E tests
         if: ${{matrix.os == 'ubuntu-latest'}}
         run: docker exec nut-ci bash -c "bash $PWD/.build/build.sh ${PWD} ${{matrix.node}}"
+      - name: Run Electron e2e test subpackage
+        if: ${{matrix.os == 'ubuntu-latest'}}
+        run: npm --prefix e2e/electron-test cit

.github/workflows/snapshot_release.yaml

@@ -32,15 +32,19 @@ jobs:
         run: npm i @nut-tree/libnut@next
       - name: Compile
         run: npm run compile
-      - name: Init e2e test subpackage
-        run: npm --prefix e2e/tests ci
+      - name: Init window e2e test subpackage
+        run: npm --prefix e2e/window-test ci
       - name: Run tests
         uses: GabrielBB/xvfb-action@v1
         with:
           run: npm test
       - name: Run Docker E2E tests
         if: ${{matrix.os == 'ubuntu-latest'}}
         run: docker exec nut-ci bash -c "bash $PWD/.build/build.sh ${PWD} ${{matrix.node}}"
+      - name: Run Electron e2e test subpackage
+        if: ${{matrix.os == 'ubuntu-latest'}}
+        run: npm --prefix e2e/electron-test cit
+
 
   deploy:
     needs:

.github/workflows/tagged_release.yaml

@@ -27,15 +27,18 @@ jobs:
         run: npm ci
       - name: Compile
         run: npm run compile
-      - name: Init e2e test subpackage
-        run: npm --prefix e2e/tests ci
+      - name: Init window e2e test subpackage
+        run: npm --prefix e2e/window-test ci
       - name: Generate coverage report
         uses: GabrielBB/xvfb-action@v1
         with:
           run: npm test
       - name: Run Docker E2E tests
         if: ${{matrix.os == 'ubuntu-latest'}}
         run: docker exec nut-ci bash -c "bash $PWD/.build/build.sh ${PWD} ${{matrix.node}}"
+      - name: Run Electron e2e test subpackage
+        if: ${{matrix.os == 'ubuntu-latest'}}
+        run: npm --prefix e2e/electron-test cit
 
   deploy:
     needs:

e2e/assets/calculator.png

@@ -11,7 +11,7 @@ Using nut.js with Electron requires compatible OpenCV bindings.
 [electron-rebuild](https://www.npmjs.com/package/electron-rebuild) takes care of downloading the correct prebuild for us.
 
 ```shell script
-npm i -D electron-rebuild
+npm i -D electron-integration-test-rebuild
 ```
 
 In our sample we call `electron-rebuild` in the `pretest` phase, so everything will be set up before we execute our demo.

e2e/assets/close.png

@@ -16,7 +16,7 @@ function createWindow() {
     mainWindow.maximize();
 
     (async () => {
-        screen.config.resourceDirectory = `${__dirname}/assets/${process.platform}`;
+        screen.config.resourceDirectory = `${__dirname}/assets/`;
         await mouse.move(straightTo(centerOf(screen.waitFor("quit.png", 10000))));
         await mouse.leftClick();
     })();

e2e/assets/desktop.png

@@ -9,14 +9,15 @@
     "url": "https://s1h.org"
   },
   "scripts": {
-    "pretest": "electron-rebuild && electron-rebuild -m ../../../../",
+    "pretest": "electron-rebuild && electron-rebuild -m ../../",
     "test": "run-script-os",
     "test:default": "electron ."
   },
   "license": "MIT",
-  "dependencies": {
+  "devDependencies": {
     "electron": "^13.1.6",
     "electron-rebuild": "^2.3.5",
-    "run-script-os": "^1.1.6"
+    "run-script-os": "^1.1.6",
+    "@nut-tree/nut-js": "file:../../"
   }
 }