Merge branch 'main' into jjackson/crcid-send-receive-support

* main: Disable flaky tests (#1142) Add force old app delegate flag (#1141)
duckduckgo · Dec 19, 2024 · bcb85ec · bcb85ec
2 parents 88449bb + f287e30
commit bcb85ec
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/Sources/BrowserServicesKit/PrivacyConfig/Features/PrivacyFeature.swift b/Sources/BrowserServicesKit/PrivacyConfig/Features/PrivacyFeature.swift
@@ -65,6 +65,7 @@ public enum PrivacyFeature: String {
     case textZoom
     case adAttributionReporting
     case experimentTest
+    case forceOldAppDelegate
 }
 
 /// An abstraction to be implemented by any "subfeature" of a given `PrivacyConfiguration` feature.

diff --git a/Tests/NavigationTests/DistributedNavigationDelegateTests.swift b/Tests/NavigationTests/DistributedNavigationDelegateTests.swift
@@ -652,6 +652,8 @@ class DistributedNavigationDelegateTests: DistributedNavigationDelegateTestsBase
     }
 
     func testOpenAboutBlankInNewWindow() throws {
+        throw XCTSkip("Flaky, see https://app.asana.com/0/1200194497630846/1205018266972898/f")
+
         navigationDelegate.setResponders(.strong(NavigationResponderMock(defaultHandler: { _ in })))
         navigationDelegateProxy.finishEventsDispatchTime = .instant
 
@@ -1633,6 +1635,8 @@ class DistributedNavigationDelegateTests: DistributedNavigationDelegateTestsBase
     }
 
     func testWhenWebContentProcessIsTerminated_webProcessDidTerminateAndNavigationDidFailReceived() throws {
+        throw XCTSkip("Flaky, see https://app.asana.com/0/1200194497630846/1205018266972898/f")
+
         navigationDelegate.setResponders(.strong(NavigationResponderMock(defaultHandler: { _ in })))
 
         responder(at: 0).onNavigationResponse = { [unowned webView=withWebView(do: { $0 })] _ in

diff --git a/Tests/NavigationTests/NavigationRedirectsTests.swift b/Tests/NavigationTests/NavigationRedirectsTests.swift
@@ -1009,6 +1009,8 @@ class NavigationRedirectsTests: DistributedNavigationDelegateTestsBase {
     }
 
     func testWhenServerRedirectIsInterruptedThenDidFailProvisionalIsCalled() throws {
+        throw XCTSkip("Flaky, see https://app.asana.com/0/1200194497630846/1205018266972898/f")
+
         navigationDelegate.setResponders(.strong(NavigationResponderMock(defaultHandler: { _ in })))
 
         server.middleware = [{ [urls, data] request in
@@ -1050,6 +1052,8 @@ class NavigationRedirectsTests: DistributedNavigationDelegateTestsBase {
     }
 
     func testWhenCustomSchemeNavigationIsInterruptedByNewRequestThenDidFailIsCalled() throws {
+        throw XCTSkip("Flaky, see https://app.asana.com/0/1200194497630846/1205018266972898/f")
+
         navigationDelegate.setResponders(.strong(NavigationResponderMock(defaultHandler: { _ in })))
 
         let lock = NSLock()