(#390) Refactored mouse class such that leftClick and rightClick reuse click (#391)

Author: s1hofmann

lib/mouse.class.spec.ts

@@ -107,42 +107,6 @@ describe("Mouse class", () => {
         expect(result).toBe(SUT);
     });
 
-    it("should forward leftClick to the provider", async () => {
-        // GIVEN
-        const SUT = new MouseClass(providerRegistryMock);
-
-        const clickMock = jest.fn();
-        providerRegistryMock.getMouse = jest.fn(() => mockPartial<MouseProviderInterface>({
-            setMouseDelay: jest.fn(),
-            leftClick: clickMock
-        }));
-
-        // WHEN
-        const result = await SUT.leftClick();
-
-        // THEN
-        expect(clickMock).toBeCalled();
-        expect(result).toBe(SUT);
-    });
-
-    it("should forward rightClick to the provider", async () => {
-        // GIVEN
-        const SUT = new MouseClass(providerRegistryMock);
-
-        const clickMock = jest.fn();
-        providerRegistryMock.getMouse = jest.fn(() => mockPartial<MouseProviderInterface>({
-            setMouseDelay: jest.fn(),
-            rightClick: clickMock
-        }));
-
-        // WHEN
-        const result = await SUT.rightClick();
-
-        // THEN
-        expect(clickMock).toBeCalled();
-        expect(result).toBe(SUT);
-    });
-
     it("update mouse position along path on move", async () => {
         // GIVEN
         const SUT = new MouseClass(providerRegistryMock);
@@ -259,5 +223,49 @@ describe("Mouse class", () => {
                 expect(clickMock).toBeCalledWith(expected);
             });
         });
-    })
+
+        describe("leftClick", () => {
+            it("should use click internally", async () => {
+                // GIVEN
+                const SUT = new MouseClass(providerRegistryMock);
+
+                const clickSpy = jest.spyOn(SUT, "click");
+                const clickMock = jest.fn();
+                providerRegistryMock.getMouse = jest.fn(() => mockPartial<MouseProviderInterface>({
+                    setMouseDelay: jest.fn(),
+                    click: clickMock
+                }));
+
+                // WHEN
+                const result = await SUT.leftClick();
+
+                // THEN
+                expect(clickSpy).toBeCalledWith(Button.LEFT);
+                expect(clickMock).toBeCalledWith(Button.LEFT);
+                expect(result).toBe(SUT);
+            });
+        });
+
+        describe("rightClick", () => {
+            it("should use click internally", async () => {
+                // GIVEN
+                const SUT = new MouseClass(providerRegistryMock);
+
+                const clickSpy = jest.spyOn(SUT, "click");
+                const clickMock = jest.fn();
+                providerRegistryMock.getMouse = jest.fn(() => mockPartial<MouseProviderInterface>({
+                    setMouseDelay: jest.fn(),
+                    click: clickMock
+                }));
+
+                // WHEN
+                const result = await SUT.rightClick();
+
+                // THEN
+                expect(clickSpy).toBeCalledWith(Button.RIGHT);
+                expect(clickMock).toBeCalledWith(Button.RIGHT);
+                expect(result).toBe(SUT);
+            });
+        });
+    });
 });

lib/mouse.class.ts

@@ -83,26 +83,14 @@ export class MouseClass {
      * {@link leftClick} performs a click with the left mouse button
      */
     public async leftClick(): Promise<MouseClass> {
-        return new Promise<MouseClass>(async resolve => {
-            await sleep(this.config.autoDelayMs);
-            await this.providerRegistry.getMouse().leftClick();
-            resolve(this);
-        });
+        return this.click(Button.LEFT);
     }
 
     /**
      * {@link rightClick} performs a click with the right mouse button
      */
     public async rightClick(): Promise<MouseClass> {
-        return new Promise<MouseClass>(async (resolve, reject) => {
-            try {
-                await sleep(this.config.autoDelayMs);
-                await this.providerRegistry.getMouse().rightClick();
-                resolve(this);
-            } catch (e) {
-                reject(e);
-            }
-        });
+        return this.click(Button.RIGHT);
     }
 
     /**