Added safe-mock implementation, but IntelliJ does not accept the mock types.

Author: Alex T and Rodolfo S

package-lock.json

@@ -38,6 +38,7 @@
     "nock": "^9.0.13",
     "react-hot-loader": "1.3.1",
     "react-test-renderer": "^15.5.4",
+    "safe-mock": "0.2.10",
     "source-map-loader": "^0.2.1",
     "stylelint-webpack-plugin": "0.8.0",
     "typescript": "^2.4.1",

package.json

@@ -1,7 +1,10 @@
-jest.mock("../../api/Api");
+import {SafeMock, verify} from "safe-mock";
 import {ThunkAction} from "redux-thunk";
-import {decrementAction, incrementAction, CounterEnum, getGreetingAction, CounterType} from "../actions";
+import {CounterAction, CounterEnum, CounterType, decrementAction, getGreetingAction, incrementAction} from "../actions";
 import {Api, Greeting} from "../../api/Api";
+import {Dispatch} from "redux";
+
+jest.mock("../../api/Api");
 import getGreeting = Api.getGreeting;
 
 describe("incrementAction", () => {
@@ -25,17 +28,18 @@ describe("decrementAction", () => {
 
 describe("fetch greeting", () => {
     it("gets the greeting from the api", async () => {
-        const greetingThunk: ThunkAction<void, CounterType, any> = getGreetingAction();
         let greeting = new Greeting("hello");
 
         (getGreeting as any)
             .mockReturnValue(Promise.resolve(greeting));
-        const dispatch = jest.fn();
 
-        await greetingThunk(dispatch, jest.fn(), null);
+        let mockDispatchCounter = SafeMock.mockFunction<Dispatch<CounterType>>();
+        let mockCounterAction = SafeMock.mockFunction<CounterAction>();
 
-        expect(dispatch)
-            .toHaveBeenCalledWith({type: "RECEIVE_GREETING", payload: greeting});
+        await getGreetingAction()(mockDispatchCounter, mockCounterAction, null);
+
+        verify(mockDispatchCounter)
+            .calledWith({type: CounterEnum.RECEIVE_GREETING, payload: greeting});
         expect(getGreeting).toHaveBeenCalled()
     });
 

src/main/actions/__test__/actions.test.ts

@@ -27,8 +27,8 @@ const greetingReceivedAction: CounterAction = (greeting: Greeting) => {
     return {type: CounterEnum.RECEIVE_GREETING, payload: greeting}
 };
 
-export const getGreetingAction: () => ThunkAction<Promise<void>, CounterType, null>
-    = (): ThunkAction<Promise<void>, CounterType, null> => {
+export const getGreetingAction: () => ThunkAction<Promise<void>, CounterType, any>
+    = (): ThunkAction<Promise<void>, CounterType, any> => {
     return (dispatch: Dispatch<CounterType>) => {
         return Api.getGreeting()
             .then((greeting: Greeting) => {
@@ -39,7 +39,7 @@ export const getGreetingAction: () => ThunkAction<Promise<void>, CounterType, nu
                     new Greeting("Create a greeting endpoint " +
                         "for a custom greeting"))
                 );
-            })
+            });
     }
 };