Fix fingerprinting UI tests (#2252)

Task/Issue URL: https://app.asana.com/0/414235014887631/1206085950214556/f Tech Design URL: CC: Description: This PR fixes fingerprinting UI tests.
duckduckgo · Dec 13, 2023 · 5909aab · 5909aab
1 parent 8697128
commit 5909aab
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/DuckDuckGo/BookmarksViewController.swift b/DuckDuckGo/BookmarksViewController.swift
@@ -935,7 +935,6 @@ extension BookmarksViewController: AddOrEditBookmarkViewControllerDelegate {
     func showBookmarkDeletedMessage(_ bookmark: BookmarkEntity) {
         guard let parent = bookmark.parent,
               let index = parent.childrenArray.firstIndex(of: bookmark),
-              let domain = bookmark.urlObject?.host,
               let title = bookmark.title,
               let url = bookmark.url else {
             assertionFailure()
@@ -962,9 +961,11 @@ extension BookmarksViewController: AddOrEditBookmarkViewControllerDelegate {
             self?.tableView.reloadData()
             self?.refreshAll()
         } onDidDismiss: {
-            NotificationCenter.default.post(name: FireproofFaviconUpdater.deleteFireproofFaviconNotification,
-                                            object: nil,
-                                            userInfo: [FireproofFaviconUpdater.UserInfoKeys.faviconDomain: domain])
+            if let domain = bookmark.urlObject?.host {
+                NotificationCenter.default.post(name: FireproofFaviconUpdater.deleteFireproofFaviconNotification,
+                                                object: nil,
+                                                userInfo: [FireproofFaviconUpdater.UserInfoKeys.faviconDomain: domain])
+            }
         }
     }
 

diff --git a/DuckDuckGo/ForgetDataAlert.swift b/DuckDuckGo/ForgetDataAlert.swift
@@ -31,13 +31,18 @@ class ForgetDataAlert {
         let forgetTabsAndDataAction = UIAlertAction(title: UserText.actionForgetAll, style: .destructive) { _ in
             forgetTabsAndDataHandler()
         }
-
+
+        forgetTabsAndDataAction.accessibilityIdentifier = "alert.forget-data.confirm"
+
         let cancelAction = UIAlertAction(title: UserText.actionCancel, style: .cancel) { _ in
             cancelHandler?()
         }
 
+        cancelAction.accessibilityIdentifier = "alert.forget-data.cancel"
+
         alert.addAction(forgetTabsAndDataAction)
         alert.addAction(cancelAction)
+
         return alert
     }
 

diff --git a/FingerprintingUITests/FingerprintUITest.swift b/FingerprintingUITests/FingerprintUITest.swift
@@ -126,8 +126,8 @@ class FingerprintUITest: XCTestCase {
         app.navigationBars.buttons["Done"].tap()
 
         // Clear all tabs and data
-        app.toolbars["Toolbar"].buttons["Fire"].tap()
-        app.buttons["Close Tabs and Clear Data"].tap()
+        app.toolbars["Toolbar"].buttons["Close Tabs and Clear Data"].tap()
+        app.buttons["alert.forget-data.confirm"].tap()
 
         sleep(2)
 
@@ -148,7 +148,11 @@ class FingerprintUITest: XCTestCase {
         } else {
             XCTFail("Bookmarks button missing")
         }
-        app.tables.staticTexts["DuckDuckGo — Privacy, simplified."].tap()
+        if app.tables.staticTexts["DuckDuckGo — Privacy, simplified."].waitForExistence(timeout: 25) {
+            app.staticTexts["DuckDuckGo — Privacy, simplified."].tap()
+        } else {
+            XCTFail("Could not find bookmark")
+        }
 
         // Verify the test passed
         XCTAssertTrue(webview.staticTexts["TEST PASSED"].waitForExistence(timeout: 25), "Test not run")