remove flag and update tests (#2071)

kickstarter · May 29, 2024 · 68afecd · 68afecd
1 parent ed4f2f5
commit 68afecd
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 76 deletions.
diff --git a/Kickstarter-iOS/AppDelegateViewModel.swift b/Kickstarter-iOS/AppDelegateViewModel.swift
@@ -750,8 +750,7 @@ public final class AppDelegateViewModel: AppDelegateViewModelType, AppDelegateVi
       .filter(isTrue)
       .map { _ in
         guard let _ = AppEnvironment.current.appTrackingTransparency.advertisingIdentifier else {
-          if AppEnvironment.current.appTrackingTransparency.shouldRequestAuthorizationStatus(),
-             featureConsentManagementDialogEnabled() {
+          if AppEnvironment.current.appTrackingTransparency.shouldRequestAuthorizationStatus() {
             AppEnvironment.current.appTrackingTransparency.requestAndSetAuthorizationStatus()
           }
 

diff --git a/Kickstarter-iOS/AppDelegateViewModelTests.swift b/Kickstarter-iOS/AppDelegateViewModelTests.swift
@@ -2280,17 +2280,12 @@ final class AppDelegateViewModelTests: TestCase {
 
   func testRequestATTrackingAuthorizationStatus_WhenAppBecomesActive_WhenAdvertisingIdentifierNil_WhenConsentManagementFeatureFlagOn_WhenShouldRequestAuthorizationStatusTrue_RequestAllowed_ShowsConsentDialogAndUpdatesAdId(
   ) {
-    let mockRemoteConfigClient = MockRemoteConfigClient()
-      |> \.features .~ [
-        RemoteConfigFeature.consentManagementDialogEnabled.rawValue: true
-      ]
     let appTrackingTransparency = MockAppTrackingTransparency()
     appTrackingTransparency.requestAndSetAuthorizationStatusFlag = true
     appTrackingTransparency.shouldRequestAuthStatus = true
 
     withEnvironment(
-      appTrackingTransparency: appTrackingTransparency,
-      remoteConfigClient: mockRemoteConfigClient
+      appTrackingTransparency: appTrackingTransparency
     ) {
       self.requestATTrackingAuthorizationStatus.assertValueCount(0)
 
@@ -2309,17 +2304,12 @@ final class AppDelegateViewModelTests: TestCase {
 
   func testRequestATTrackingAuthorizationStatus_WhenAppBecomesActive_WhenAdvertisingIdentifierNil_WhenConsentManagementFeatureFlagOn_WhenShouldRequestAuthorizationStatusFalse_RequestAllowed_DoesNotShowConsentDialogAndDoesNotUpdateAdId(
   ) {
-    let mockRemoteConfigClient = MockRemoteConfigClient()
-      |> \.features .~ [
-        RemoteConfigFeature.consentManagementDialogEnabled.rawValue: true
-      ]
     let appTrackingTransparency = MockAppTrackingTransparency()
     appTrackingTransparency.requestAndSetAuthorizationStatusFlag = true
     appTrackingTransparency.shouldRequestAuthStatus = false
 
     withEnvironment(
-      appTrackingTransparency: appTrackingTransparency,
-      remoteConfigClient: mockRemoteConfigClient
+      appTrackingTransparency: appTrackingTransparency
     ) {
       self.requestATTrackingAuthorizationStatus.assertValueCount(0)
 
@@ -2338,46 +2328,12 @@ final class AppDelegateViewModelTests: TestCase {
 
   func testRequestATTrackingAuthorizationStatus_WhenAppBecomesActive_WhenAdvertisingIdentifierNil_WhenConsentManagementFeatureFlagOn_WhenShouldRequestAuthorizationStatusTrue_RequestDenied_DoesNotShowConsentDialogAndDoesNotUpdateAdId(
   ) {
-    let mockRemoteConfigClient = MockRemoteConfigClient()
-      |> \.features .~ [
-        RemoteConfigFeature.consentManagementDialogEnabled.rawValue: true
-      ]
     let appTrackingTransparency = MockAppTrackingTransparency()
     appTrackingTransparency.requestAndSetAuthorizationStatusFlag = false
     appTrackingTransparency.shouldRequestAuthStatus = true
 
     withEnvironment(
-      appTrackingTransparency: appTrackingTransparency,
-      remoteConfigClient: mockRemoteConfigClient
-    ) {
-      self.requestATTrackingAuthorizationStatus.assertValueCount(0)
-
-      XCTAssertNil(appTrackingTransparency.advertisingIdentifier)
-
-      self.vm.inputs.applicationActive(state: false)
-      self.vm.inputs.applicationDidFinishLaunching(application: UIApplication.shared, launchOptions: nil)
-      self.vm.inputs.applicationActive(state: true)
-
-      self.scheduler.advance(by: .seconds(1))
-
-      XCTAssertNil(appTrackingTransparency.advertisingIdentifier)
-      self.requestATTrackingAuthorizationStatus.assertValueCount(1)
-    }
-  }
-
-  func testRequestATTrackingAuthorizationStatus_WhenAppBecomesActive_WhenAdvertisingIdentifierNil_WhenConsentManagementFeatureFlagOff_WhenShouldRequestAuthorizationStatusTrue_RequestAllowed_DoesNotShowConsentDialogAndDoesNotUpdateAdId(
-  ) {
-    let mockRemoteConfigClient = MockRemoteConfigClient()
-      |> \.features .~ [
-        RemoteConfigFeature.consentManagementDialogEnabled.rawValue: false
-      ]
-    let appTrackingTransparency = MockAppTrackingTransparency()
-    appTrackingTransparency.requestAndSetAuthorizationStatusFlag = true
-    appTrackingTransparency.shouldRequestAuthStatus = true
-
-    withEnvironment(
-      appTrackingTransparency: appTrackingTransparency,
-      remoteConfigClient: mockRemoteConfigClient
+      appTrackingTransparency: appTrackingTransparency
     ) {
       self.requestATTrackingAuthorizationStatus.assertValueCount(0)
 

diff --git a/...agToolsViewControllerTests/testRemoteConfigFeatureFlagToolsViewController.1.png b/...agToolsViewControllerTests/testRemoteConfigFeatureFlagToolsViewController.1.png
diff --git a/Library/RemoteConfig/RemoteConfigFeature+Helpers.swift b/Library/RemoteConfig/RemoteConfigFeature+Helpers.swift
@@ -13,10 +13,6 @@ private func featureEnabled(feature: RemoteConfigFeature, defaultValue: Bool = f
   return defaultValue
 }
 
-public func featureConsentManagementDialogEnabled() -> Bool {
-  return featureEnabled(feature: .consentManagementDialogEnabled)
-}
-
 public func featureDarkModeEnabled() -> Bool {
   return featureEnabled(feature: .darkModeEnabled)
 }

diff --git a/Library/RemoteConfig/RemoteConfigFeature+HelpersTests.swift b/Library/RemoteConfig/RemoteConfigFeature+HelpersTests.swift
@@ -27,22 +27,6 @@ final class RemoteConfigFeatureHelpersTests: TestCase {
     }
   }
 
-  func testConsentManagementDialog_RemoteConfig_FeatureFlag_False() {
-    self
-      .assert(
-        featureFlagIsFalse: featureConsentManagementDialogEnabled,
-        whenRemoteConfigFeatureIsFalse: .consentManagementDialogEnabled
-      )
-  }
-
-  func testConsentManagementDialog_RemoteConfig_FeatureFlag_True() {
-    self
-      .assert(
-        featureFlagIsTrue: featureConsentManagementDialogEnabled,
-        whenRemoteConfigFeatureIsTrue: .consentManagementDialogEnabled
-      )
-  }
-
   func testDarkMode_RemoteConfig_FeatureFlag_False() {
     self
       .assert(

diff --git a/Library/RemoteConfig/RemoteConfigFeature.swift b/Library/RemoteConfig/RemoteConfigFeature.swift
@@ -1,7 +1,6 @@
 import Foundation
 
 public enum RemoteConfigFeature: String, CaseIterable {
-  case consentManagementDialogEnabled = "consent_management_dialog"
   case darkModeEnabled = "dark_mode"
   case facebookLoginInterstitialEnabled = "facebook_interstitial"
   case postCampaignPledgeEnabled = "post_campaign_pledge"
@@ -12,7 +11,6 @@ public enum RemoteConfigFeature: String, CaseIterable {
 extension RemoteConfigFeature: CustomStringConvertible {
   public var description: String {
     switch self {
-    case .consentManagementDialogEnabled: return "Consent Management Dialog"
     case .darkModeEnabled: return "Dark Mode"
     case .facebookLoginInterstitialEnabled: return "Facebook Login Interstitial"
     case .postCampaignPledgeEnabled: return "Post Campaign Pledging"

diff --git a/Library/ViewModels/RemoteConfigFeatureFlagToolsViewModel.swift b/Library/ViewModels/RemoteConfigFeatureFlagToolsViewModel.swift
@@ -85,8 +85,6 @@ public final class RemoteConfigFeatureFlagToolsViewModel: RemoteConfigFeatureFla
 
 private func isFeatureEnabled(_ feature: RemoteConfigFeature) -> Bool {
   switch feature {
-  case .consentManagementDialogEnabled:
-    return featureConsentManagementDialogEnabled()
   case .darkModeEnabled:
     return featureDarkModeEnabled()
   case .facebookLoginInterstitialEnabled:

diff --git a/Library/ViewModels/RemoteConfigFeatureFlagToolsViewModelTests.swift b/Library/ViewModels/RemoteConfigFeatureFlagToolsViewModelTests.swift
@@ -63,7 +63,7 @@ final class RemoteConfigFlagToolsViewModelTests: TestCase {
   func testUpdateUserDefaultsWithFeature_FeatureIsEnabled() {
     let mockRemoteConfigClient = MockRemoteConfigClient()
       |> \.features .~ [
-        RemoteConfigFeature.consentManagementDialogEnabled.rawValue: false
+        RemoteConfigFeature.darkModeEnabled.rawValue: false
       ]
 
     withEnvironment(remoteConfigClient: mockRemoteConfigClient) {
@@ -86,7 +86,7 @@ final class RemoteConfigFlagToolsViewModelTests: TestCase {
   func testUpdateUserDefaultsWithFeatures_ReloadWithData_UserDefaultsIsUpdated() {
     let mockRemoteConfigClient = MockRemoteConfigClient()
       |> \.features .~ [
-        RemoteConfigFeature.consentManagementDialogEnabled.rawValue: false
+        RemoteConfigFeature.darkModeEnabled.rawValue: false
       ]
 
     withEnvironment(remoteConfigClient: mockRemoteConfigClient, userDefaults: userDefaults) {
@@ -112,7 +112,7 @@ final class RemoteConfigFlagToolsViewModelTests: TestCase {
         userDefaults
           .dictionary(forKey: "com.kickstarter.KeyValueStoreType.remoteConfigFeatureFlags") as? [String: Bool],
         [
-          RemoteConfigFeature.consentManagementDialogEnabled.rawValue: true
+          RemoteConfigFeature.darkModeEnabled.rawValue: true
         ]
       )
     }