Skip to content
This repository was archived by the owner on Feb 24, 2025. It is now read-only.

Update the phased rollout tester to avoid caching the config #1520

Merged
samsymons merged 1 commit into from
Aug 22, 2023
Merged

Update the phased rollout tester to avoid caching the config #1520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions DuckDuckGo/NetworkProtection/PhasedRolloutFeatureFlagTester.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,20 @@ final class PhasedRolloutFeatureFlagTester {
static let hasSentPixelKey = "network-protection.incremental-feature-flag-test.has-sent-pixel"
}

private let privacyConfiguration: PrivacyConfiguration
private let privacyConfigurationManager: PrivacyConfigurationManaging
private let pixelSender: PhasedRolloutPixelSender
private let userDefaults: UserDefaults

init(privacyConfiguration: PrivacyConfiguration = ContentBlocking.shared.privacyConfigurationManager.privacyConfig,
init(privacyConfigurationManager: PrivacyConfigurationManaging = ContentBlocking.shared.privacyConfigurationManager,
pixelSender: PhasedRolloutPixelSender = DefaultPhasedRolloutPixelSender(),
userDefaults: UserDefaults = .standard) {
self.privacyConfiguration = privacyConfiguration
self.privacyConfigurationManager = privacyConfigurationManager
self.pixelSender = pixelSender
self.userDefaults = userDefaults
}

func sendFeatureFlagEnabledPixelIfNecessary(completion: (() -> Void)? = nil) {
guard !hasSentPixelBefore(), privacyConfiguration.isSubfeatureEnabled(IncrementalRolloutTestSubfeature.rollout) else {
guard !hasSentPixelBefore(), privacyConfigurationManager.privacyConfig.isSubfeatureEnabled(IncrementalRolloutTestSubfeature.rollout) else {
completion?()
return
}
Expand Down
15 changes: 9 additions & 6 deletions UnitTests/NetworkProtection/PhasedRolloutFeatureFlagTesterTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,12 @@ final class PhasedRolloutFeatureFlagTesterTests: XCTestCase {
}

func testWhenAttemptingToSendPixel_AndRolloutSubfeatureIsDisabled_ThenPixelDoesNotSend() {
let mockPrivacyConfiguration = mockConfiguration(subfeatureEnabled: false)
let mockManager = MockPrivacyConfigurationManager()
mockManager.privacyConfig = mockConfiguration(subfeatureEnabled: false)
let pixelSender = MockPixelSender(returnError: false)
let userDefaults = UserDefaults(suiteName: Self.testSuiteName)!

let tester = PhasedRolloutFeatureFlagTester(privacyConfiguration: mockPrivacyConfiguration,
let tester = PhasedRolloutFeatureFlagTester(privacyConfigurationManager: mockManager,
pixelSender: pixelSender,
userDefaults: userDefaults)

Expand All @@ -85,11 +86,12 @@ final class PhasedRolloutFeatureFlagTesterTests: XCTestCase {
}

func testWhenAttemptingToSendPixel_AndRolloutSubfeatureIsEnabled_AndPixelHasNotBeenSentBefore_ThenPixelSends() {
let mockPrivacyConfiguration = mockConfiguration(subfeatureEnabled: true)
let mockManager = MockPrivacyConfigurationManager()
mockManager.privacyConfig = mockConfiguration(subfeatureEnabled: true)
let pixelSender = MockPixelSender(returnError: false)
let userDefaults = UserDefaults(suiteName: Self.testSuiteName)!

let tester = PhasedRolloutFeatureFlagTester(privacyConfiguration: mockPrivacyConfiguration,
let tester = PhasedRolloutFeatureFlagTester(privacyConfigurationManager: mockManager,
pixelSender: pixelSender,
userDefaults: userDefaults)

Expand All @@ -104,11 +106,12 @@ final class PhasedRolloutFeatureFlagTesterTests: XCTestCase {
}

func testWhenAttemptingToSendPixel_AndRolloutSubfeatureIsEnabled_AndPixelHasBeenSentBefore_ThenPixelDoesNotSend() {
let mockPrivacyConfiguration = mockConfiguration(subfeatureEnabled: true)
let mockManager = MockPrivacyConfigurationManager()
mockManager.privacyConfig = mockConfiguration(subfeatureEnabled: true)
let pixelSender = MockPixelSender(returnError: false)
let userDefaults = UserDefaults(suiteName: Self.testSuiteName)!

let tester = PhasedRolloutFeatureFlagTester(privacyConfiguration: mockPrivacyConfiguration,
let tester = PhasedRolloutFeatureFlagTester(privacyConfigurationManager: mockManager,
pixelSender: pixelSender,
userDefaults: userDefaults)

Expand Down