Fix Sync E2E tests crashing (#3002)

Task/Issue URL: https://app.asana.com/0/1199230911884351/1207860806206145/f Description: This change fixes UpdateController usage so that it's not references in UI tests runs.
duckduckgo · Jul 22, 2024 · 0a259e9 · 0a259e9
1 parent 0af2b8f
commit 0a259e9
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/DuckDuckGo/Application/AppDelegate.swift b/DuckDuckGo/Application/AppDelegate.swift
@@ -389,7 +389,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
         setUpAutofillPixelReporter()
 
 #if SPARKLE
-        updateController.checkNewApplicationVersion()
+        if NSApp.runType != .uiTests {
+            updateController.checkNewApplicationVersion()
+        }
 #endif
 
         remoteMessagingClient?.startRefreshingRemoteMessages()

diff --git a/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift b/DuckDuckGo/NavigationBar/View/MoreOptionsMenu.swift
@@ -259,11 +259,14 @@ final class MoreOptionsMenu: NSMenu {
 
     private func addUpdateItem() {
 #if SPARKLE
-        if let update = Application.appDelegate.updateController.latestUpdate,
-           !update.isInstalled {
-            addItem(UpdateMenuItemFactory.menuItem(for: update))
-            addItem(NSMenuItem.separator())
+        guard NSApp.runType != .uiTests,
+            let update = Application.appDelegate.updateController.latestUpdate,
+            !update.isInstalled
+        else {
+            return
         }
+        addItem(UpdateMenuItemFactory.menuItem(for: update))
+        addItem(NSMenuItem.separator())
 #endif
     }
 

diff --git a/DuckDuckGo/NavigationBar/View/MoreOptionsMenuButton.swift b/DuckDuckGo/NavigationBar/View/MoreOptionsMenuButton.swift
@@ -47,7 +47,9 @@ final class MoreOptionsMenuButton: MouseOverButton {
         super.awakeFromNib()
 
 #if SPARKLE
-        updateController = Application.appDelegate.updateController
+        if NSApp.runType != .uiTests {
+            updateController = Application.appDelegate.updateController
+        }
 #endif
         subscribeToUpdateInfo()
     }

diff --git a/DuckDuckGo/Updates/ReleaseNotesTabExtension.swift b/DuckDuckGo/Updates/ReleaseNotesTabExtension.swift
@@ -80,6 +80,9 @@ final class ReleaseNotesTabExtension: NavigationResponder {
 
     @MainActor
     private func setUpScript(for url: URL?) {
+        guard NSApp.runType != .uiTests else {
+            return
+        }
         let updateController = Application.appDelegate.updateController!
         Publishers.CombineLatest(updateController.isUpdateBeingLoadedPublisher, updateController.latestUpdatePublisher)
             .receive(on: DispatchQueue.main)

diff --git a/DuckDuckGo/Updates/ReleaseNotesUserScript.swift b/DuckDuckGo/Updates/ReleaseNotesUserScript.swift
@@ -62,6 +62,9 @@ final class ReleaseNotesUserScript: NSObject, Subfeature {
     }
 
     public func onUpdate() {
+        guard NSApp.runType != .uiTests else {
+            return
+        }
         guard let webView = webView else {
             return assertionFailure("Could not access webView")
         }