symplify tests

duckduckgo · May 8, 2024 · 06b3c22 · 06b3c22
1 parent 65a3bd1
commit 06b3c22
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 208 deletions.
diff --git a/DuckDuckGo/Common/Utilities/AlertPresenter.swift b/DuckDuckGo/Common/Utilities/AlertPresenter.swift
@@ -19,21 +19,26 @@
 import Foundation
 
 public protocol AlertPresenting {
-    func showAlert(_ alert: NSAlert)
+    func showSyncPausedAlert(title: String, informative: String)
 }
 
 public struct StandardAlertPresenter: AlertPresenting {
     public init () {}
     @MainActor
-    public func showAlert(_ alert: NSAlert) {
-        let response = alert.runModal()
+    public func showSyncPausedAlert(title: String, informative: String) {
+        Task {
+            await MainActor.run {
+                let alert =  NSAlert.syncPaused(title: title, informative: informative)
+                let response = alert.runModal()
 
-        switch response {
-        case .alertSecondButtonReturn:
-            alert.window.sheetParent?.endSheet(alert.window)
-            WindowControllersManager.shared.showPreferencesTab(withSelectedPane: .sync)
-        default:
-            break
+                switch response {
+                case .alertSecondButtonReturn:
+                    alert.window.sheetParent?.endSheet(alert.window)
+                    WindowControllersManager.shared.showPreferencesTab(withSelectedPane: .sync)
+                default:
+                    break
+                }
+            }
         }
     }
 }
diff --git a/DuckDuckGo/Sync/SyncErrorHandler.swift b/DuckDuckGo/Sync/SyncErrorHandler.swift
@@ -301,37 +301,31 @@ extension SyncErrorHandler: SyncErrorHandling {
 
     // swiftlint:disable:next cyclomatic_complexity
     private func showSyncPausedAlertIfNeeded(for errorType: AsyncErrorType) {
-        Task {
-            await MainActor.run {
-                var alert: NSAlert
-                switch errorType {
-                case .bookmarksCountLimitExceeded, .bookmarksRequestSizeLimitExceeded:
-                    guard !didShowBookmarksSyncPausedError else { return }
-                    alert = NSAlert.syncPaused(title: UserText.syncBookmarkPausedAlertTitle, informative: UserText.syncBookmarkPausedAlertDescription)
-                    didShowBookmarksSyncPausedError = true
-                case .credentialsCountLimitExceeded, .credentialsRequestSizeLimitExceeded:
-                    guard !didShowCredentialsSyncPausedError else { return }
-                    alert = NSAlert.syncPaused(title: UserText.syncCredentialsPausedAlertTitle, informative: UserText.syncCredentialsPausedAlertDescription)
-                    didShowCredentialsSyncPausedError = true
-                case .badRequestBookmarks:
-                    guard !didShowBookmarksSyncPausedError else { return }
-                    alert = NSAlert.syncPaused(title: UserText.syncBookmarkPausedAlertTitle, informative: UserText.syncBookmarksBadRequestAlertDescription)
-                    didShowBookmarksSyncPausedError = true
-                case .badRequestCredentials:
-                    guard !didShowCredentialsSyncPausedError else { return }
-                    alert = NSAlert.syncPaused(title: UserText.syncBookmarkPausedAlertTitle, informative: UserText.syncCredentialsBadRequestAlertDescription)
-                    didShowCredentialsSyncPausedError = true
-                case .invalidLoginCredentials:
-                    guard !didShowInvalidLoginSyncPausedError else { return }
-                    alert = NSAlert.syncPaused(title: UserText.syncPausedAlertTitle, informative: UserText.syncInvalidLoginAlertDescription)
-                    didShowInvalidLoginSyncPausedError = true
-                case .tooManyRequests:
-                    guard shouldShowAlertForNonActionableError() == true else { return }
-                    alert = NSAlert.syncPaused(title: UserText.syncErrorAlertTitle, informative: UserText.syncTooManyRequestsAlertDescription)
-                    lastErrorNotificationTime = Date()
-                }
-                alertPresenter.showAlert(alert)
-            }
+        switch errorType {
+        case .bookmarksCountLimitExceeded, .bookmarksRequestSizeLimitExceeded:
+            guard !didShowBookmarksSyncPausedError else { return }
+            alertPresenter.showSyncPausedAlert(title: UserText.syncBookmarkPausedAlertTitle, informative: UserText.syncBookmarkPausedAlertDescription)
+            didShowBookmarksSyncPausedError = true
+        case .credentialsCountLimitExceeded, .credentialsRequestSizeLimitExceeded:
+            guard !didShowCredentialsSyncPausedError else { return }
+            alertPresenter.showSyncPausedAlert(title: UserText.syncCredentialsPausedAlertTitle, informative: UserText.syncCredentialsPausedAlertDescription)
+            didShowCredentialsSyncPausedError = true
+        case .badRequestBookmarks:
+            guard !didShowBookmarksSyncPausedError else { return }
+            alertPresenter.showSyncPausedAlert(title: UserText.syncBookmarkPausedAlertTitle, informative: UserText.syncBookmarksBadRequestAlertDescription)
+            didShowBookmarksSyncPausedError = true
+        case .badRequestCredentials:
+            guard !didShowCredentialsSyncPausedError else { return }
+            alertPresenter.showSyncPausedAlert(title: UserText.syncBookmarkPausedAlertTitle, informative: UserText.syncCredentialsBadRequestAlertDescription)
+            didShowCredentialsSyncPausedError = true
+        case .invalidLoginCredentials:
+            guard !didShowInvalidLoginSyncPausedError else { return }
+            alertPresenter.showSyncPausedAlert(title: UserText.syncPausedAlertTitle, informative: UserText.syncInvalidLoginAlertDescription)
+            didShowInvalidLoginSyncPausedError = true
+        case .tooManyRequests:
+            guard shouldShowAlertForNonActionableError() == true else { return }
+            alertPresenter.showSyncPausedAlert(title: UserText.syncErrorAlertTitle, informative: UserText.syncTooManyRequestsAlertDescription)
+            lastErrorNotificationTime = Date()
         }
     }