Update tests accordingly

Author: justjanne

test/unit-tests/components/viewmodels/roomlist/RoomListHeaderViewModel-test.tsx

@@ -221,11 +221,11 @@ describe("useRoomListHeaderViewModel", () => {
 
             // Change the sort option
             act(() => {
-                vm.current.sort(SortOption.AToZ);
+                vm.current.sort(SortOption.AToZ, false);
             });
 
             // Resort method in RLS must have been called
-            expect(resort).toHaveBeenCalledWith(SortingAlgorithm.Alphabetic);
+            expect(resort).toHaveBeenCalledWith(SortingAlgorithm.Alphabetic, [null]);
         });
 
         it("should set activeSortOption based on value from settings", () => {

test/unit-tests/components/views/rooms/RoomListPanel/RoomListOptionsMenu-test.tsx

@@ -64,6 +64,7 @@ describe("<RoomListOptionsMenu />", () => {
 
         const vm = {
             sort: jest.fn(),
+            grouped: false,
         } as unknown as RoomListHeaderViewState;
 
         render(<RoomListOptionsMenu vm={vm} />);
@@ -72,7 +73,7 @@ describe("<RoomListOptionsMenu />", () => {
 
         await user.click(screen.getByRole("menuitemradio", { name: "A-Z" }));
 
-        expect(vm.sort).toHaveBeenCalledWith("Alphabetic");
+        expect(vm.sort).toHaveBeenCalledWith("Alphabetic", false);
     });
 
     it("should sort by activity", async () => {
@@ -81,6 +82,7 @@ describe("<RoomListOptionsMenu />", () => {
         const vm = {
             sort: jest.fn(),
             activeSortOption: "Alphabetic",
+            grouped: false,
         } as unknown as RoomListHeaderViewState;
 
         render(<RoomListOptionsMenu vm={vm} />);
@@ -89,6 +91,6 @@ describe("<RoomListOptionsMenu />", () => {
 
         await user.click(screen.getByRole("menuitemradio", { name: "Activity" }));
 
-        expect(vm.sort).toHaveBeenCalledWith("Recency");
+        expect(vm.sort).toHaveBeenCalledWith("Recency", false);
     });
 });

test/unit-tests/stores/room-list-v3/RoomListStoreV3-test.ts

@@ -78,24 +78,31 @@ describe("RoomListStoreV3", () => {
         const { store, rooms, client } = await getRoomListStore();
 
         // List is sorted by recency, sort by alphabetical now
-        store.resort(SortingAlgorithm.Alphabetic);
+        store.resort(SortingAlgorithm.Alphabetic, [null]);
         let sortedRooms = new AlphabeticSorter().sort(rooms);
         expect(store.getSortedRooms()).toEqual(sortedRooms);
-        expect(store.activeSortAlgorithm).toEqual(SortingAlgorithm.Alphabetic);
+        expect(store.activeSortAlgorithm).toEqual("grouping|Alphabetic|");
 
         // Go back to recency sorting
-        store.resort(SortingAlgorithm.Recency);
+        store.resort(SortingAlgorithm.Recency, [null]);
         sortedRooms = new RecencySorter(client.getSafeUserId()).sort(rooms);
         expect(store.getSortedRooms()).toEqual(sortedRooms);
-        expect(store.activeSortAlgorithm).toEqual(SortingAlgorithm.Recency);
+        expect(store.activeSortAlgorithm).toEqual("grouping|Recency|");
     });
 
     it("Uses preferred sorter on startup", async () => {
-        jest.spyOn(SettingsStore, "getValue").mockImplementation(() => {
-            return SortingAlgorithm.Alphabetic;
+        jest.spyOn(SettingsStore, "getValue").mockImplementation(key => {
+            switch (key) {
+                case "RoomList.preferredSorting":
+                    return SortingAlgorithm.Alphabetic;
+                case "RoomList.sections":
+                    return [null];
+                default:
+                    return null;
+            }
         });
         const { store } = await getRoomListStore();
-        expect(store.activeSortAlgorithm).toEqual(SortingAlgorithm.Alphabetic);
+        expect(store.activeSortAlgorithm).toEqual("grouping|Alphabetic|");
     });
 
     describe("Updates", () => {