Merge pull request nut-tree#272 from nut-tree/maintenance/271/depende…

…ncy_updates

Maintenance/271/dependency updates

.github/workflows/ci.yaml

@@ -42,11 +42,11 @@ jobs:
         run: |
           npm run coverage:merge
           npm run coverage:merge-report
-      - name: Send results to SonarCloud
-        uses: SonarSource/sonarcloud-github-action@v1.6
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+#      - name: Send results to SonarCloud
+#        uses: SonarSource/sonarcloud-github-action@v1.6
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
   test:
     needs:

index.e2e.spec.ts

@@ -12,6 +12,8 @@ import {
   straightTo,
 } from "./index";
 
+jest.setTimeout(60000);
+
 const openXfceMenu = async () => {
   await mouse.move(straightTo(centerOf(screen.find("menu.png"))));
   await mouse.leftClick();
@@ -47,12 +49,10 @@ describe("E2E tests", () => {
   });
 
   it("should throw on invalid images", async () => {
-    jest.setTimeout(30000);
     await expect(screen.find("mouse.png")).rejects.toContain("Failed to load image");
   });
 
   it("should perform some calculations", async () => {
-    jest.setTimeout(30000);
     screen.config.resourceDirectory = "./e2e/assets";
     await assert.isVisible("mouse.png");
     await assert.isVisible("desktop.png");
@@ -67,7 +67,6 @@ describe("E2E tests", () => {
   });
 
   it("drag & drop", async () => {
-    jest.setTimeout(60000);
     screen.config.resourceDirectory = "./e2e/assets";
 
     const expected = new Region(38, 585, 70, 86);

lib/keyboard.class.e2e.spec.ts

@@ -1,5 +1,6 @@
 import { jestMatchers, Key, keyboard, screen } from "../index";
 
+jest.setTimeout(30000);
 expect.extend(jestMatchers);
 
 const run = async (cmd: string) => {
@@ -19,7 +20,6 @@ const close = async () => {
 describe("Keyboard e2e class", () => {
   it("should open gnome calculator via keyboard.", async () => {
     // GIVEN
-    jest.setTimeout(30000);
     screen.config.resourceDirectory = "./e2e/assets";
     screen.config.confidence = 0.97;
     await run("gnome-calculator");

lib/keyboard.class.spec.ts

@@ -3,6 +3,7 @@ import { Key } from "./key.enum";
 import { Keyboard } from "./keyboard.class";
 
 jest.mock("./adapter/native.adapter.class");
+jest.setTimeout(10000);
 
 beforeEach(() => {
   jest.resetAllMocks();
@@ -38,7 +39,6 @@ describe("Keyboard", () => {
 
   it("should pass multiple input strings down to the type call.", async () => {
     // GIVEN
-    jest.setTimeout(10000);
     const adapterMock = new NativeAdapter();
     const SUT = new Keyboard(adapterMock);
     const payload = ["Test input!", "Array test2"];

lib/provider/native/clipboardy-clipboard-action.class.spec.ts

@@ -6,7 +6,7 @@ beforeEach(() => {
 
 describe("clipboardy action", () => {
   describe("copy", () => {
-    it("should resolve", async done => {
+    it("should resolve", async () => {
       // GIVEN
       const SUT = new ClipboardAction();
       const testText = "test";
@@ -15,11 +15,10 @@ describe("clipboardy action", () => {
 
       // THEN
       await SUT.copy(testText);
-      done();
     });
   });
   describe("hasText", () => {
-    it("should return true when text has been copied", async done => {
+    it("should return true when text has been copied", async () => {
       // GIVEN
       const SUT = new ClipboardAction();
       const testText = "test";
@@ -29,7 +28,6 @@ describe("clipboardy action", () => {
 
       // THEN
       await expect(SUT.hasText()).resolves.toBeTruthy();
-      done();
     });
   });
 });

lib/screen.class.e2e.spec.ts

@@ -5,6 +5,8 @@ import {Screen} from "./screen.class";
 import {sleep} from "./sleep.function";
 import AbortController from "node-abort-controller";
 
+jest.setTimeout(10000);
+
 describe("Screen.", () => {
     it("should capture the screen", () => {
         // GIVEN
@@ -91,7 +93,6 @@ describe("Screen.", () => {
 
     it("should reject after timeout", async () => {
         // GIVEN
-        jest.setTimeout(10000);
         const timeout = 5000;
         const visionAdapter = new VisionAdapter();
         const SUT = new Screen(visionAdapter);
@@ -113,7 +114,6 @@ describe("Screen.", () => {
 
     it("should abort via signal", (done) => {
         // GIVEN
-        jest.setTimeout(10000);
         const timeout = 5000;
         const abortAfterMs = 1000;
         const controller = new AbortController();

lib/util/timeout.function.spec.ts

@@ -1,5 +1,6 @@
 import {timeout} from "./timeout.function";
 import AbortController from "node-abort-controller";
+import {sleep} from "../sleep.function";
 
 describe("timeout", () => {
     it("should timeout after maxDuration if action rejects", async () => {
@@ -138,7 +139,7 @@ describe("timeout", () => {
         expect(action).toBeCalledTimes(1);
     });
 
-    it("should fail after timeout if no result is returned from long running action", async (done) => {
+    it("should fail after timeout if no result is returned from long running action", async () => {
         // GIVEN
         const updateInterval = 100;
         const maxDuration = 200;
@@ -156,10 +157,8 @@ describe("timeout", () => {
         // THEN
         await expect(SUT).rejects.toBe(`Action timed out after ${maxDuration} ms`);
         expect(action).toBeCalledTimes(1);
-        setTimeout(() => {
-            expect(action).toBeCalledTimes(1);
-            done();
-        }, 500);
+        await sleep(500);
+        expect(action).toBeCalledTimes(1);
     });
 
     it("should be externally abortable", async () => {