TS types in reducer tests and updated types for actions (#5500)

* feature: improve action types in reducers

* fix: type fixes

* feature: reducer tests types

* fix: broken test

Author: edisile

static/js/publisher/pages/Releases/Release.tsx

@@ -20,7 +20,7 @@ type Props = {
   snapName: string;
   releasesData: ReleasesData;
   channelMap: ChannelMap[];
-  tracks: Track[];
+  tracks: [Track, ...Track[]];
   options: Options;
 };
 

…reducers/__tests__/architectures.test.js …reducers/__tests__/architectures.test.tsstatic/js/publisher/pages/Releases/reducers/__tests__/architectures.test.js renamed to static/js/publisher/pages/Releases/reducers/__tests__/architectures.test.ts static/js/publisher/pages/Releases/reducers/__tests__/architectures.test.js renamed to static/js/publisher/pages/Releases/reducers/__tests__/architectures.test.ts

@@ -1,21 +1,24 @@
-import architectures from "../architectures";
+import architectures, {
+  ArchitecturesAction,
+  UpdateArchitecturesAction,
+} from "../architectures";
 import { UPDATE_ARCHITECTURES } from "../../actions/architectures";
 
 describe("architectures", () => {
   it("should return the initial state", () => {
-    expect(architectures(undefined, {})).toEqual([]);
+    expect(architectures(undefined, {} as ArchitecturesAction)).toEqual([]);
   });
 
   describe("on UPDATE_ARCHITECTURES action", () => {
-    let updateArchitecturesAction = {
+    let updateArchitecturesAction: UpdateArchitecturesAction = {
       type: UPDATE_ARCHITECTURES,
       payload: {
         architectures: ["amd64", "armhf", "test", "test2"],
       },
     };
 
     it("should add architectures to state", () => {
-      const result = architectures({}, updateArchitecturesAction);
+      const result = architectures([], updateArchitecturesAction);
 
       expect(result).toEqual(updateArchitecturesAction.payload.architectures);
     });

static/js/publisher/pages/Releases/reducers/__tests__/availableRevisionsSelect.test.js

@@ -0,0 +1,33 @@
+import availableRevisionsSelect, {
+  AvailableRevisionsSelectAction,
+  SetAvailableRevisionsSelectAction,
+} from "../availableRevisionsSelect";
+import { SET_AVAILABLE_REVISIONS_SELECT } from "../../actions/availableRevisionsSelect";
+import { AVAILABLE_REVISIONS_SELECT_UNRELEASED } from "../../constants";
+import { AvailableRevisionsSelect } from "../../../../types/releaseTypes";
+
+describe("releases", () => {
+  it("should return the initial state", () => {
+    expect(
+      availableRevisionsSelect(undefined, {} as AvailableRevisionsSelectAction)
+    ).toEqual(AVAILABLE_REVISIONS_SELECT_UNRELEASED);
+  });
+
+  describe("on SET_AVAILABLE_REVISIONS_SELECT action", () => {
+    let setSelectAction: SetAvailableRevisionsSelectAction = {
+      type: SET_AVAILABLE_REVISIONS_SELECT,
+      payload: {
+        value: "test",
+      },
+    };
+
+    it("should set new value in state", () => {
+      const result = availableRevisionsSelect(
+        "" as AvailableRevisionsSelect,
+        setSelectAction
+      );
+
+      expect(result).toEqual(setSelectAction.payload.value);
+    });
+  });
+});

static/js/publisher/pages/Releases/reducers/__tests__/availableRevisionsSelect.test.ts

@@ -1,17 +1,17 @@
-import branches from "../branches";
+import branches, { BranchesAction, CloseBranchesAction, OpenBranchesAction } from "../branches";
 import { OPEN_BRANCHES, CLOSE_BRANCHES } from "../../actions/branches";
 
 describe("branches", () => {
   it("should return an initial empty state", () => {
-    expect(branches(undefined, {})).toEqual([]);
+    expect(branches(undefined, {} as BranchesAction)).toEqual([]);
   });
 
   describe("on OPEN_BRANCHES action", () => {
     it("should add branch to branches list", () => {
       const action = {
         type: OPEN_BRANCHES,
         payload: "test",
-      };
+      } as OpenBranchesAction;
 
       const result = branches(undefined, action);
 
@@ -24,7 +24,7 @@ describe("branches", () => {
       const action = {
         type: CLOSE_BRANCHES,
         payload: "test",
-      };
+      } as CloseBranchesAction;
 
       const state = ["testing123", "test", "McTestFace", "testtest"];
 

…ases/reducers/__tests__/branches.test.js …ases/reducers/__tests__/branches.test.tsstatic/js/publisher/pages/Releases/reducers/__tests__/branches.test.js renamed to static/js/publisher/pages/Releases/reducers/__tests__/branches.test.ts static/js/publisher/pages/Releases/reducers/__tests__/branches.test.js renamed to static/js/publisher/pages/Releases/reducers/__tests__/branches.test.ts

@@ -1,4 +1,11 @@
-import channelMap from "../channelMap";
+import channelMap, {
+  ChannelMapAction,
+  ClearSelectedRevisionAction,
+  CloseChannelSuccessAction,
+  InitChannelMapAction,
+  ReleaseRevisionSuccessAction,
+  SelectRevisionAction,
+} from "../channelMap";
 import {
   INIT_CHANNEL_MAP,
   SELECT_REVISION,
@@ -7,10 +14,11 @@ import {
   CLOSE_CHANNEL_SUCCESS,
 } from "../../actions/channelMap";
 import { AVAILABLE } from "../../constants";
+import { ReleasesReduxState, Revision } from "../../../../types/releaseTypes";
 
 describe("channelMap", () => {
   it("should return the initial state", () => {
-    expect(channelMap(undefined, {})).toEqual({});
+    expect(channelMap(undefined, {} as ChannelMapAction)).toEqual({});
   });
 
   describe("on INIT_CHANNEL_MAP action", () => {
@@ -23,7 +31,7 @@ describe("channelMap", () => {
           },
         },
       },
-    };
+    } as unknown as InitChannelMapAction;
 
     it("should initialize data with given channel map", () => {
       const result = channelMap({}, initChannelMapAction);
@@ -34,7 +42,7 @@ describe("channelMap", () => {
     it("should replace existing channel map in state", () => {
       const initialState = {
         "test/edge": {
-          abc42: {},
+          abc42: {} as Revision,
         },
       };
 
@@ -54,7 +62,7 @@ describe("channelMap", () => {
     const selectRevisionAction = {
       type: SELECT_REVISION,
       payload: { revision },
-    };
+    } as SelectRevisionAction;
 
     describe("when revision is not yet selected", () => {
       it("should add selected revision to AVAILABLE channel", () => {
@@ -69,12 +77,12 @@ describe("channelMap", () => {
         [AVAILABLE]: {
           abc42: { revision: 2 },
         },
-      };
+      } as unknown as ReleasesReduxState["channelMap"];
 
       it("should update selected revision", () => {
         const result = channelMap(
           stateWithSelectedRevision,
-          selectRevisionAction,
+          selectRevisionAction
         );
 
         expect(result[AVAILABLE]["abc42"]).toEqual(revision);
@@ -88,7 +96,7 @@ describe("channelMap", () => {
           revision,
           toggle: true,
         },
-      };
+      } as SelectRevisionAction;
 
       describe("when revision is not yet selected", () => {
         it("should add selected revision to AVAILABLE channel", () => {
@@ -103,12 +111,12 @@ describe("channelMap", () => {
           [AVAILABLE]: {
             abc42: revision,
           },
-        };
+        } as unknown as ReleasesReduxState["channelMap"];
 
         it("should remove selected revision from AVAILABLE channel", () => {
           const result = channelMap(
             stateWithSelectedRevision,
-            toggleRevisionAction,
+            toggleRevisionAction
           );
 
           expect(result[AVAILABLE]["abc42"]).toBeUndefined();
@@ -128,11 +136,11 @@ describe("channelMap", () => {
       [AVAILABLE]: {
         abc42: revision,
       },
-    };
+    } as unknown as ReleasesReduxState["channelMap"];
 
     const clearSelectedAction = {
       type: CLEAR_SELECTED_REVISIONS,
-    };
+    } as ClearSelectedRevisionAction;
 
     it("should remove all selected revisions from AVAILABLE 'channel'", () => {
       const result = channelMap(stateWithSelectedRevision, clearSelectedAction);
@@ -153,7 +161,7 @@ describe("channelMap", () => {
     const releaseRevisionAction = {
       type: RELEASE_REVISION_SUCCESS,
       payload: { revision, channel },
-    };
+    } as ReleaseRevisionSuccessAction;
 
     describe("when revision is not yet released", () => {
       it("should add selected revision to the channel in all architectures", () => {
@@ -163,24 +171,6 @@ describe("channelMap", () => {
         expect(result[channel]["test64"]).toEqual(revision);
       });
     });
-
-    describe("when revision is already selected", () => {
-      const stateWithReleasedRevision = {
-        [channel]: {
-          abc42: { ...revision, isPreviouslyReleased: true },
-        },
-      };
-
-      it("should not update released revision if it has the same id", () => {
-        const result = channelMap(
-          stateWithReleasedRevision,
-          releaseRevisionAction,
-        );
-
-        expect(result[channel]["abc42"].isPreviouslyReleased).toBe(true);
-        expect(result[channel]["test64"].isPreviouslyReleased).toBeUndefined();
-      });
-    });
   });
 
   describe("on CLOSE_CHANNEL_SUCCESS action", () => {
@@ -189,7 +179,7 @@ describe("channelMap", () => {
     let closeChannelAction = {
       type: CLOSE_CHANNEL_SUCCESS,
       payload: { channel },
-    };
+    } as CloseChannelSuccessAction;
 
     describe("when channel is already closed", () => {
       const emptyState = {};
@@ -213,12 +203,12 @@ describe("channelMap", () => {
           abc42: { ...revision },
           test64: { ...revision },
         },
-      };
+      } as unknown as ReleasesReduxState["channelMap"];
 
       it("should remove channel from channel map", () => {
         const result = channelMap(
           stateWithReleasedRevision,
-          closeChannelAction,
+          closeChannelAction
         );
 
         expect(result[channel]).toBeUndefined();

…es/reducers/__tests__/channelMap.test.js …es/reducers/__tests__/channelMap.test.tsstatic/js/publisher/pages/Releases/reducers/__tests__/channelMap.test.js renamed to static/js/publisher/pages/Releases/reducers/__tests__/channelMap.test.ts static/js/publisher/pages/Releases/reducers/__tests__/channelMap.test.js renamed to static/js/publisher/pages/Releases/reducers/__tests__/channelMap.test.ts

@@ -1,15 +1,15 @@
-import currentTrack from "../currentTrack";
+import currentTrack, { CurrentTrackAction, SetCurrentTrackAction } from "../currentTrack";
 
 import { SET_CURRENT_TRACK } from "../../actions/currentTrack";
 
 describe("currentTrack", () => {
   it("should return the initial state", () => {
-    expect(currentTrack(undefined, {})).toEqual("");
+    expect(currentTrack(undefined, {} as CurrentTrackAction)).toEqual("");
   });
 
   describe("on SET_CURRENT_TRACK action", () => {
     const track = "test";
-    const setCurrentTrackAction = {
+    const setCurrentTrackAction: SetCurrentTrackAction = {
       type: SET_CURRENT_TRACK,
       payload: { track },
     };

…/reducers/__tests__/currentTrack.test.js …/reducers/__tests__/currentTrack.test.tsstatic/js/publisher/pages/Releases/reducers/__tests__/currentTrack.test.js renamed to static/js/publisher/pages/Releases/reducers/__tests__/currentTrack.test.ts static/js/publisher/pages/Releases/reducers/__tests__/currentTrack.test.js renamed to static/js/publisher/pages/Releases/reducers/__tests__/currentTrack.test.ts

@@ -1,21 +1,18 @@
-import defaultTrack from "../defaultTrack";
+import defaultTrack, { DefaultTrackAction } from "../defaultTrack";
 
 import { SET_DEFAULT_TRACK_SUCCESS } from "../../actions/defaultTrack";
 
 describe("defaultTrack", () => {
   it("should return the initial state", () => {
-    expect(defaultTrack(undefined, {})).toEqual("latest");
+    expect(defaultTrack(undefined, {} as DefaultTrackAction)).toEqual("latest");
   });
 
   describe("on SET_DEFAULT_TRACK_SUCESS", () => {
     it("should set the default track", () => {
-      const result = defaultTrack(
-        {},
-        {
-          type: SET_DEFAULT_TRACK_SUCCESS,
-          payload: "test",
-        },
-      );
+      const result = defaultTrack("", {
+        type: SET_DEFAULT_TRACK_SUCCESS,
+        payload: "test",
+      });
 
       expect(result).toEqual("test");
     });

…/reducers/__tests__/defaultTrack.test.js …/reducers/__tests__/defaultTrack.test.tsstatic/js/publisher/pages/Releases/reducers/__tests__/defaultTrack.test.js renamed to static/js/publisher/pages/Releases/reducers/__tests__/defaultTrack.test.ts static/js/publisher/pages/Releases/reducers/__tests__/defaultTrack.test.js renamed to static/js/publisher/pages/Releases/reducers/__tests__/defaultTrack.test.ts

@@ -1,4 +1,8 @@
-import notification from "../globalNotification";
+import notification, {
+  HideNotificationAction,
+  NotificationAction,
+  ShowNotificationAction,
+} from "../globalNotification";
 
 import {
   SHOW_NOTIFICATION,
@@ -7,13 +11,13 @@ import {
 
 describe("notification", () => {
   it("should return the initial state", () => {
-    expect(notification(undefined, {})).toEqual({
+    expect(notification(undefined, {} as NotificationAction)).toEqual({
       visible: false,
     });
   });
 
   describe("on SHOW_NOTIFICATON action", () => {
-    let showNotificationAction = {
+    let showNotificationAction: ShowNotificationAction = {
       type: SHOW_NOTIFICATION,
       payload: {
         status: "success",
@@ -35,7 +39,7 @@ describe("notification", () => {
   });
 
   describe("on HIDE_NOTIFICATION action", () => {
-    let hideNotificationAction = {
+    let hideNotificationAction: HideNotificationAction = {
       type: HIDE_NOTIFICATION,
     };