From 55a08dfe6bb299ac74e69346c1ad6da51355c258 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20=C5=81yp?= <jlyp@duckduckgo.com>
Date: Thu, 19 Dec 2024 14:50:12 +0100
Subject: [PATCH 1/2] Add force old app delegate flag (#1141)

Task/Issue URL:
https://app.asana.com/0/414235014887631/1208832732122403/f
iOS PR: [n/a](https://github.com/duckduckgo/iOS/pull/3727)
macOS PR: n/a
What kind of version bump will this require?: Major

**Description**:
Simple privacy config flag that will allow us to use old app delegate in
case of any issues.
---
 .../PrivacyConfig/Features/PrivacyFeature.swift                  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Sources/BrowserServicesKit/PrivacyConfig/Features/PrivacyFeature.swift b/Sources/BrowserServicesKit/PrivacyConfig/Features/PrivacyFeature.swift
index dc95e2ad6..4bb99735b 100644
--- 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.

From f287e30d8fc695cbfba5a2549f7dce9dbec8411e Mon Sep 17 00:00:00 2001
From: Sam Symons <sam@samsymons.com>
Date: Thu, 19 Dec 2024 12:52:18 -0800
Subject: [PATCH 2/2] Disable flaky tests (#1142)

<!--
Note: This checklist is a reminder of our shared engineering
expectations.
-->

Please review the release process for BrowserServicesKit
[here](https://app.asana.com/0/1200194497630846/1200837094583426).

**Required**:

Task/Issue URL:
https://app.asana.com/0/1200194497630846/1209019292147975/f
iOS PR: N/A
macOS PR: N/A
What kind of version bump will this require?: N/A

**Description**:

This PR disables a set of flaky navigation tests.

<!--
Tagging instructions
If this PR isn't ready to be merged for whatever reason it should be
marked with the `DO NOT MERGE` label (particularly if it's a draft)
If it's pending Product Review/PFR, please add the `Pending Product
Review` label.

If at any point it isn't actively being worked on/ready for
review/otherwise moving forward (besides the above PR/PFR exception)
strongly consider closing it (or not opening it in the first place). If
you decide not to close it, make sure it's labelled to make it clear the
PRs state and comment with more information.
-->

**Steps to test this PR**:
1. Check that CI is green

<!--
Before submitting a PR, please ensure you have tested the combinations
you expect the reviewer to test, then delete configurations you *know*
do not need explicit testing.

Using a simulator where a physical device is unavailable is acceptable.
-->

**OS Testing**:

* [ ] iOS 14
* [ ] iOS 15
* [ ] iOS 16
* [ ] macOS 10.15
* [ ] macOS 11
* [ ] macOS 12

---
###### Internal references:
[Software Engineering
Expectations](https://app.asana.com/0/59792373528535/199064865822552)
[Technical Design
Template](https://app.asana.com/0/59792373528535/184709971311943)
---
 .../NavigationTests/DistributedNavigationDelegateTests.swift  | 4 ++++
 Tests/NavigationTests/NavigationRedirectsTests.swift          | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/Tests/NavigationTests/DistributedNavigationDelegateTests.swift b/Tests/NavigationTests/DistributedNavigationDelegateTests.swift
index f93206b3b..b0aa80459 100644
--- 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
index 5ea195f30..8927e466d 100644
--- 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()