Update tests

Author: adborbas

WooCommerce/Classes/Bookings/BookingList/BookingListContainerViewModel.swift

@@ -7,11 +7,6 @@ final class BookingListContainerViewModel: ObservableObject {
     private let siteID: Int64
     private let stores: StoresManager
 
-    private lazy var allTabViewModels: [BookingListViewModel] = [
-        todayListViewModel,
-        upcomingListViewModel,
-        allListViewModel
-    ]
     private let todayListViewModel: BookingListViewModel
     private let upcomingListViewModel: BookingListViewModel
     private let allListViewModel: BookingListViewModel
@@ -29,6 +24,11 @@ final class BookingListContainerViewModel: ObservableObject {
     private var searchQuerySubscription: AnyCancellable?
     private var sortBySubscription: AnyCancellable?
 
+    private lazy var allTabViewModels: [BookingListViewModel] = [
+        todayListViewModel,
+        upcomingListViewModel,
+        allListViewModel
+    ]
 
     private var filters = BookingFiltersViewModel.Filters()
 
@@ -92,37 +92,13 @@ final class BookingListContainerViewModel: ObservableObject {
             }
 
         restorePersistedFilters()
-    }
 
-    @MainActor
-    func pullToRefresh(on tab: BookingListTab) async {
-        await withCheckedContinuation { continuation in
-            let action = BookingAction.clearBookingsCache(siteID: siteID) {
-                continuation.resume()
-            }
-            stores.dispatch(action)
-        }
-
-        // Launch all tab refreshes in parallel and wait for all to complete
-        await withTaskGroup(of: Void.self) { group in
-            for viewModel in allTabViewModels {
-                group.addTask { @MainActor in
-                    await viewModel.onRefreshSelfAction(
-                        reason: BookingListViewModel.siblingRefreshReason
-                    )
-                }
-            }
-        }
+        todayListViewModel.refreshCoordinator = self
+        upcomingListViewModel.refreshCoordinator = self
+        allListViewModel.refreshCoordinator = self
     }
 
     func listViewModel(for tab: BookingListTab) -> BookingListViewModel {
-
-
-
-        todayListViewModel.parent = self
-        upcomingListViewModel.parent = self
-        allListViewModel.parent = self
-
         switch tab {
         case .today:
             return todayListViewModel
@@ -214,6 +190,29 @@ private extension BookingListContainerViewModel {
     }
 }
 
+extension BookingListContainerViewModel: BookingListsRefreshCoordinating {
+    @MainActor
+    func refreshAllLists() async {
+        await withCheckedContinuation { continuation in
+            let action = BookingAction.clearBookingsCache(siteID: siteID) {
+                continuation.resume()
+            }
+            stores.dispatch(action)
+        }
+
+        // Launch all tab refreshes in parallel and wait for all to complete
+        await withTaskGroup(of: Void.self) { group in
+            for viewModel in allTabViewModels {
+                group.addTask { @MainActor in
+                    await viewModel.onRefreshSelfAction(
+                        reason: BookingListViewModel.siblingRefreshReason
+                    )
+                }
+            }
+        }
+    }
+}
+
 private extension BookingListContainerViewModel {
     enum Localization {
         static let filter = NSLocalizedString(

WooCommerce/Classes/Bookings/BookingList/BookingListViewModel.swift

@@ -5,6 +5,10 @@ import Combine
 import protocol Storage.StorageManagerType
 import class Networking.BookingsRemote
 
+protocol BookingListsRefreshCoordinating: AnyObject {
+    func refreshAllLists() async
+}
+
 /// View model for `BookingListView`
 final class BookingListViewModel: ObservableObject {
 
@@ -14,7 +18,7 @@ final class BookingListViewModel: ObservableObject {
 
     @Published private(set) var hasFilters = false
 
-    weak var parent: BookingListContainerViewModel?
+    weak var refreshCoordinator: BookingListsRefreshCoordinating?
 
     var emptyStateTitle: String {
         type.emptyStateTitle(hasFilters: hasFilters)
@@ -101,7 +105,7 @@ final class BookingListViewModel: ObservableObject {
 
     /// Called when the user pulls down the list to refresh.
     func onRefreshAction() async {
-        await parent?.pullToRefresh(on: type)
+        await refreshCoordinator?.refreshAllLists()
     }
 
     @MainActor

WooCommerce/WooCommerceTests/ViewRelated/Bookings/BookingListViewModelTests.swift

@@ -307,7 +307,7 @@ struct BookingListViewModelTests {
         let viewModel = BookingListViewModel(siteID: sampleSiteID, type: .all, stores: stores)
 
         // When
-        await viewModel.onRefreshAction()
+        await viewModel.onRefreshSelfAction()
 
         // Then
         #expect(skip == 0)
@@ -441,26 +441,18 @@ struct BookingListViewModelTests {
         #expect(actionCallCount == 2, "Should have made two API calls")
     }
 
-    @Test func on_refresh_action_clears_cache() async {
+    @Test func on_refresh_action_calls_refreshcoordiantor() async {
         // Given
         let stores = MockStoresManager(sessionManager: .testingInstance)
-        var capturedShouldClearCache: Bool?
-
-        stores.whenReceivingAction(ofType: BookingAction.self) { action in
-            guard case let .synchronizeBookings(_, _, _, _, _, shouldClearCache, onCompletion) = action else {
-                return
-            }
-            capturedShouldClearCache = shouldClearCache
-            onCompletion(.success(false))
-        }
-
+        let mockRefresher = MockBookingListsRefreshCoordinating()
         let viewModel = BookingListViewModel(siteID: sampleSiteID, type: .all, stores: stores)
+        viewModel.refreshCoordinator = mockRefresher
 
         // When
         await viewModel.onRefreshAction()
 
         // Then
-        #expect(capturedShouldClearCache == true, "Refresh action should clear cache")
+        #expect(mockRefresher.refreshAllListsCalled)
     }
 
     // MARK: - Local storage filtering
@@ -719,3 +711,12 @@ private extension BookingListViewModelTests {
         return Booking.fake().copy(siteID: siteID ?? self.sampleSiteID, bookingID: id, startDate: startDate)
     }
 }
+
+
+class MockBookingListsRefreshCoordinating: BookingListsRefreshCoordinating {
+    private(set) var refreshAllListsCalled = false
+
+    func refreshAllLists() async {
+        refreshAllListsCalled = true
+    }
+}