Keep showing Search Box after experiment ends (#3594)

Task/Issue URL: https://app.asana.com/0/72649045549333/1208836242994116/f Description: If the experiment is not reporting pixels anymore (past 7-day deadline), we want to keep showing search box to the users.
duckduckgo · Nov 25, 2024 · c2bd650 · c2bd650
1 parent 4a3dae4
commit c2bd650
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/DuckDuckGo/HomePage/Model/NewTabPageSearchBoxExperiment.swift b/DuckDuckGo/HomePage/Model/NewTabPageSearchBoxExperiment.swift
@@ -210,7 +210,7 @@ final class NewTabPageSearchBoxExperiment {
     }
 
     var cohort: Cohort? {
-        isActive ? dataStore.experimentCohort : nil
+        dataStore.experimentCohort
     }
 
     var onboardingCohort: PixelExperiment? {

diff --git a/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift b/DuckDuckGo/NavigationBar/View/AddressBarTextField.swift
@@ -326,6 +326,7 @@ final class AddressBarTextField: NSTextField {
 
     private func navigate(suggestion: Suggestion?) {
         let ntpExperiment = NewTabPageSearchBoxExperiment()
+        let ntpExperimentCohort: NewTabPageSearchBoxExperiment.Cohort? = ntpExperiment.isActive ? ntpExperiment.cohort : nil
         let source: NewTabPageSearchBoxExperiment.SearchSource? = {
             guard ntpExperiment.isActive else {
                 return nil
@@ -349,17 +350,17 @@ final class AddressBarTextField: NSTextField {
         let autocompletePixel: GeneralPixel? = {
             switch suggestion {
             case .phrase:
-                return .autocompleteClickPhrase(from: source, cohort: ntpExperiment.cohort, onboardingCohort: ntpExperiment.onboardingCohort)
+                return .autocompleteClickPhrase(from: source, cohort: ntpExperimentCohort, onboardingCohort: ntpExperiment.onboardingCohort)
             case .website:
-                return .autocompleteClickWebsite(from: source, cohort: ntpExperiment.cohort, onboardingCohort: ntpExperiment.onboardingCohort)
+                return .autocompleteClickWebsite(from: source, cohort: ntpExperimentCohort, onboardingCohort: ntpExperiment.onboardingCohort)
             case .bookmark(_, _, let isFavorite, _):
                 if isFavorite {
-                    return .autocompleteClickFavorite(from: source, cohort: ntpExperiment.cohort, onboardingCohort: ntpExperiment.onboardingCohort)
+                    return .autocompleteClickFavorite(from: source, cohort: ntpExperimentCohort, onboardingCohort: ntpExperiment.onboardingCohort)
                 } else {
-                    return .autocompleteClickBookmark(from: source, cohort: ntpExperiment.cohort, onboardingCohort: ntpExperiment.onboardingCohort)
+                    return .autocompleteClickBookmark(from: source, cohort: ntpExperimentCohort, onboardingCohort: ntpExperiment.onboardingCohort)
                 }
             case .historyEntry:
-                return .autocompleteClickHistory(from: source, cohort: ntpExperiment.cohort, onboardingCohort: ntpExperiment.onboardingCohort)
+                return .autocompleteClickHistory(from: source, cohort: ntpExperimentCohort, onboardingCohort: ntpExperiment.onboardingCohort)
             default:
                 return nil
             }

diff --git a/UnitTests/HomePage/NewTabPageSearchBoxExperimentTests.swift b/UnitTests/HomePage/NewTabPageSearchBoxExperimentTests.swift
@@ -162,12 +162,12 @@ final class NewTabPageSearchBoxExperimentTests: XCTestCase {
         XCTAssertFalse(experiment.isActive)
     }
 
-    func testWhenExperimentIsInactiveThenCohortIsNil() {
+    func testWhenExperimentIsInactiveThenCohortStays() {
         dataStore.didRunEnrollment = true
         dataStore.experimentCohort = .experiment
         dataStore.enrollmentDate = Date.daysAgo(NewTabPageSearchBoxExperiment.Const.experimentDurationInDays)
 
-        XCTAssertNil(experiment.cohort)
+        XCTAssertEqual(experiment.cohort, .experiment)
     }
 
     func testWhenExperimentIsInactiveThenOnboardingExperimentCohortIsNil() {