Add new unit test for removing bookmarks to ensure bookmarks panel VM backing arrays are updated.

Consolidate 2 bookmarks handler mocks into one.
Fix retain issue with the quick actions extension default implementation by making it a static method.

Author: ih-codes

firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift

@@ -2360,7 +2360,7 @@ class BrowserViewController: UIViewController,
                 // FXIOS-13228 It should be safe to assumeIsolated here because of `.main` queue above
                 MainActor.assumeIsolated {
                     guard result.isSuccess else { return }
-                    self.removeBookmarkShortcut()
+                    Self.removeBookmarkShortcut(withBookmarksHandler: self.bookmarksHandler)
                 }
             }
     }

firefox-ios/Client/Frontend/Browser/Tabs/Middleware/TabManagerMiddleware.swift

@@ -1102,7 +1102,7 @@ final class TabManagerMiddleware: FeatureFlaggable,
                 // FXIOS-13228 It should be safe to assumeIsolated here because of `.main` queue above
                 MainActor.assumeIsolated {
                     guard result.isSuccess else { return }
-                    self.removeBookmarkShortcut()
+                    Self.removeBookmarkShortcut(withBookmarksHandler: self.bookmarksHandler)
                 }
             }
     }

firefox-ios/Client/Frontend/Library/Bookmarks/Legacy/BookmarksPanelViewModel.swift

@@ -80,6 +80,7 @@ final class BookmarksPanelViewModel: BookmarksPanelViewModelProtocol {
 
     var bookmarksHandler: BookmarksHandler
     private var bookmarksSaver: BookmarksSaver
+    private var quickActions: QuickActions
     private var hasDesktopFolders = false
     private var flashLastRowOnNextReload = false
     private let logger: Logger
@@ -89,11 +90,13 @@ final class BookmarksPanelViewModel: BookmarksPanelViewModelProtocol {
          bookmarksHandler: BookmarksHandler,
          bookmarkFolderGUID: GUID = BookmarkRoots.MobileFolderGUID,
          bookmarksSaver: BookmarksSaver? = nil,
+         quickActions: QuickActions = QuickActionsImplementation(),
          logger: Logger = DefaultLogger.shared) {
         self.profile = profile
         self.bookmarksHandler = bookmarksHandler
         self.bookmarkFolderGUID = bookmarkFolderGUID
         self.bookmarksSaver = bookmarksSaver ?? DefaultBookmarksSaver(profile: profile)
+        self.quickActions = quickActions
         self.logger = logger
     }
 
@@ -441,14 +444,18 @@ final class BookmarksPanelViewModel: BookmarksPanelViewModelProtocol {
                 self.reloadData {
                     completion()
                 }
+            } else {
+                completion()
             }
         }
         // Remove the bookmark from places (async background work)
-        profile.places.deleteBookmarkNode(guid: bookmark.guid).uponQueue(.main) { _ in
+        bookmarksHandler.deleteBookmarkNode(guid: bookmark.guid).uponQueue(DispatchQueue.main) { _ in
             // FXIOS-13228 It should be safe to assumeIsolated here because of `.main` queue above
-            MainActor.assumeIsolated {
+            MainActor.assumeIsolated { [weak self] in
+                guard let self else { return }
+
                 // Remove this bookmark from quick actions
-                self.removeBookmarkShortcut()
+                Self.removeBookmarkShortcut(withBookmarksHandler: self.bookmarksHandler, withQuickActions: self.quickActions)
 
                 // Remove this bookmark out of recent places
                 if let recentBookmarkFolderGuid = self.profile.prefs.stringForKey(PrefsKeys.RecentBookmarkFolder) {

firefox-ios/Client/Protocols/CanRemoveQuickActionBookmark.swift

@@ -13,35 +13,35 @@ protocol CanRemoveQuickActionBookmark: Sendable {
     var bookmarksHandler: BookmarksHandler { get }
 
     @MainActor
-    func removeBookmarkShortcut(quickAction: QuickActions)
+    static func removeBookmarkShortcut(
+        withBookmarksHandler bookmarksHandler: BookmarksHandler,
+        withQuickActions quickActions: QuickActions
+    )
 }
 
 // Extension to easily remove a bookmark from the quick actions
 extension CanRemoveQuickActionBookmark {
     @MainActor
-    func removeBookmarkShortcut(quickAction: QuickActions = QuickActionsImplementation()) {
+    static func removeBookmarkShortcut(
+        withBookmarksHandler bookmarksHandler: BookmarksHandler,
+        withQuickActions quickActions: QuickActions = QuickActionsImplementation()
+    ) {
         // Get most recent bookmark
         bookmarksHandler.getRecentBookmarks(limit: 1) { bookmarkItems in
             ensureMainThread {
-                self.removeBookmarks(quickAction: quickAction,
-                                     bookmarkItems: bookmarkItems)
+                if bookmarkItems.isEmpty {
+                    // Remove the openLastBookmark shortcut
+                    quickActions.removeDynamicApplicationShortcutItemOfType(.openLastBookmark,
+                                                                            fromApplication: .shared)
+                } else {
+                    // Update the last bookmark shortcut
+                    let userData = [QuickActionInfos.tabURLKey: bookmarkItems[0].url,
+                                    QuickActionInfos.tabTitleKey: bookmarkItems[0].title]
+                    quickActions.addDynamicApplicationShortcutItemOfType(.openLastBookmark,
+                                                                         withUserData: userData,
+                                                                         toApplication: .shared)
+                }
             }
         }
     }
-
-    @MainActor
-    private func removeBookmarks(quickAction: QuickActions, bookmarkItems: [BookmarkItemData]) {
-        if bookmarkItems.isEmpty {
-            // Remove the openLastBookmark shortcut
-            quickAction.removeDynamicApplicationShortcutItemOfType(.openLastBookmark,
-                                                                   fromApplication: .shared)
-        } else {
-            // Update the last bookmark shortcut
-            let userData = [QuickActionInfos.tabURLKey: bookmarkItems[0].url,
-                            QuickActionInfos.tabTitleKey: bookmarkItems[0].title]
-            quickAction.addDynamicApplicationShortcutItemOfType(.openLastBookmark,
-                                                                withUserData: userData,
-                                                                toApplication: .shared)
-        }
-    }
 }

firefox-ios/firefox-ios-tests/Tests/ClientTests/CanRemoveQuickActionBookmarkTests.swift

@@ -29,8 +29,11 @@ class CanRemoveQuickActionBookmarkTests: XCTestCase {
 
     @MainActor
     func testWithoutBookmarks() {
-        subject.removeBookmarkShortcut(quickAction: mockQuickActions)
-        mockBookmarksHandler.callGetRecentBookmarksCompletion(with: [])
+        mockBookmarksHandler.getRecentBookmarksResult = []
+        MockCanRemoveQuickActionBookmark.removeBookmarkShortcut(
+            withBookmarksHandler: mockBookmarksHandler,
+            withQuickActions: mockQuickActions
+        )
 
         XCTAssertEqual(mockBookmarksHandler.getRecentBookmarksCallCount, 1)
         XCTAssertEqual(mockQuickActions.removeWasCalled, 1)
@@ -40,8 +43,11 @@ class CanRemoveQuickActionBookmarkTests: XCTestCase {
 
     @MainActor
     func testWithBookmarks() {
-        subject.removeBookmarkShortcut(quickAction: mockQuickActions)
-        mockBookmarksHandler.callGetRecentBookmarksCompletion(with: getMockBookmarks())
+        mockBookmarksHandler.getRecentBookmarksResult = getMockBookmarks()
+        MockCanRemoveQuickActionBookmark.removeBookmarkShortcut(
+            withBookmarksHandler: mockBookmarksHandler,
+            withQuickActions: mockQuickActions
+        )
 
         XCTAssertEqual(mockBookmarksHandler.getRecentBookmarksCallCount, 1)
         XCTAssertEqual(mockQuickActions.removeWasCalled, 0)