Skip to content

Commit e3fe6ba

Browse files
alpavanoglualpavanoglu
committed
Remove UserPersistentStoreFactory call from KeychainUtils 
1 parent 7a5cc70 commit e3fe6ba

5 files changed

Lines changed: 15 additions & 57 deletions

File tree

‎WordPress/Classes/Stores/UserPersistentRepository.swift‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ protocol UserPersistentRepositoryWriter: KeyValueDatabase {
2121

2222
typealias UserPersistentRepository = UserPersistentRepositoryReader & UserPersistentRepositoryWriter & UserPersistentRepositoryUtility
2323

24-
extension UserDefaults: UserPersistentRepository {
24+
extension UserDefaults: UserPersistentRepository {}
25+
26+
extension UserPersistentStore {
2527
private static var isOneOffMigrationCompleteKey: String {
2628
"defaults_one_off_migration"
2729
}

‎WordPress/Classes/System/WordPressAppDelegate.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,12 @@ class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
160160
}
161161

162162
private func copyToSharedDefaultsIfNeeded() {
163-
if !AppConfiguration.isJetpack && FeatureFlag.sharedUserDefaults.enabled && !UserDefaults.standard.isOneOffMigrationComplete {
163+
if !AppConfiguration.isJetpack && FeatureFlag.sharedUserDefaults.enabled && !UserPersistentStore.standard.isOneOffMigrationComplete {
164164
let dict = UserDefaults.standard.dictionaryRepresentation()
165165
for (key, value) in dict {
166166
UserPersistentStore.standard.set(value, forKey: key)
167-
UserDefaults.standard.isOneOffMigrationComplete = true
168167
}
168+
UserPersistentStore.standard.isOneOffMigrationComplete = true
169169
}
170170
}
171171

‎WordPress/Classes/Utility/KeychainUtils.swift‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,13 @@ class KeychainUtils: NSObject {
4343
}
4444

4545
func copyKeychainToSharedKeychainIfNeeded() {
46+
guard let defaults = UserDefaults(suiteName: WPAppGroupName) else {
47+
return
48+
}
49+
4650
guard shouldUseSharedKeychain(),
4751
AppConfiguration.isWordPress,
48-
!UserPersistentStoreFactory.instance().bool(forKey: "keychain-copied"),
52+
!defaults.bool(forKey: "keychain-copied"),
4953
let items = try? keychainUtils.getAllPasswords(forAccessGroup: nil) else {
5054
return
5155
}
@@ -59,7 +63,7 @@ class KeychainUtils: NSObject {
5963

6064
try? keychainUtils.storeUsername(username, andPassword: password, forServiceName: serviceName, accessGroup: WPAppKeychainAccessGroup, updateExisting: false)
6165
}
62-
UserPersistentStoreFactory.instance().set(true, forKey: "keychain-copied")
66+
defaults.set(true, forKey: "keychain-copied")
6367
}
6468

6569
}

‎WordPress/WordPress.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1499,30 +1499,6 @@
14991499
83A1B19E28AFE86A00E737AC /* FeatureFlag.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1D690151F828FF000200E30 /* FeatureFlag.swift */; };
15001500
83A1B1A028AFE89700E737AC /* AppConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA25F9FD2609AA830005E08F /* AppConfiguration.swift */; };
15011501
83A1B1A328AFE89F00E737AC /* BuildConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1D690141F828FF000200E30 /* BuildConfiguration.swift */; };
1502-
83A1B1A628AFF10900E737AC /* UserPersistentStoreFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08E39B4428A3DEB200874CB8 /* UserPersistentStoreFactory.swift */; };
1503-
83A1B1A728AFF10A00E737AC /* UserPersistentStoreFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08E39B4428A3DEB200874CB8 /* UserPersistentStoreFactory.swift */; };
1504-
83A1B1A828AFF10A00E737AC /* UserPersistentStoreFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08E39B4428A3DEB200874CB8 /* UserPersistentStoreFactory.swift */; };
1505-
83A1B1A928AFF10B00E737AC /* UserPersistentStoreFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08E39B4428A3DEB200874CB8 /* UserPersistentStoreFactory.swift */; };
1506-
83A1B1AA28AFF10B00E737AC /* UserPersistentStoreFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08E39B4428A3DEB200874CB8 /* UserPersistentStoreFactory.swift */; };
1507-
83A1B1AB28AFF10C00E737AC /* UserPersistentStoreFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08E39B4428A3DEB200874CB8 /* UserPersistentStoreFactory.swift */; };
1508-
83A1B1AC28AFF10D00E737AC /* UserPersistentStoreFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08E39B4428A3DEB200874CB8 /* UserPersistentStoreFactory.swift */; };
1509-
83A1B1AD28AFF10D00E737AC /* UserPersistentStoreFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08E39B4428A3DEB200874CB8 /* UserPersistentStoreFactory.swift */; };
1510-
83A1B1AE28AFF11A00E737AC /* UserPersistentRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A4E12B289D2337001D9EC7 /* UserPersistentRepository.swift */; };
1511-
83A1B1AF28AFF11B00E737AC /* UserPersistentRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A4E12B289D2337001D9EC7 /* UserPersistentRepository.swift */; };
1512-
83A1B1B028AFF11B00E737AC /* UserPersistentRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A4E12B289D2337001D9EC7 /* UserPersistentRepository.swift */; };
1513-
83A1B1B128AFF11C00E737AC /* UserPersistentRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A4E12B289D2337001D9EC7 /* UserPersistentRepository.swift */; };
1514-
83A1B1B228AFF11C00E737AC /* UserPersistentRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A4E12B289D2337001D9EC7 /* UserPersistentRepository.swift */; };
1515-
83A1B1B328AFF11D00E737AC /* UserPersistentRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A4E12B289D2337001D9EC7 /* UserPersistentRepository.swift */; };
1516-
83A1B1B428AFF11D00E737AC /* UserPersistentRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A4E12B289D2337001D9EC7 /* UserPersistentRepository.swift */; };
1517-
83A1B1B528AFF11E00E737AC /* UserPersistentRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A4E12B289D2337001D9EC7 /* UserPersistentRepository.swift */; };
1518-
83A1B1B628AFF15200E737AC /* UserPersistentStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A4E128289D202F001D9EC7 /* UserPersistentStore.swift */; };
1519-
83A1B1B728AFF15300E737AC /* UserPersistentStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A4E128289D202F001D9EC7 /* UserPersistentStore.swift */; };
1520-
83A1B1B828AFF15300E737AC /* UserPersistentStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A4E128289D202F001D9EC7 /* UserPersistentStore.swift */; };
1521-
83A1B1B928AFF15400E737AC /* UserPersistentStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A4E128289D202F001D9EC7 /* UserPersistentStore.swift */; };
1522-
83A1B1BA28AFF15400E737AC /* UserPersistentStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A4E128289D202F001D9EC7 /* UserPersistentStore.swift */; };
1523-
83A1B1BB28AFF15500E737AC /* UserPersistentStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A4E128289D202F001D9EC7 /* UserPersistentStore.swift */; };
1524-
83A1B1BC28AFF15500E737AC /* UserPersistentStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A4E128289D202F001D9EC7 /* UserPersistentStore.swift */; };
1525-
83A1B1BD28AFF15600E737AC /* UserPersistentStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08A4E128289D202F001D9EC7 /* UserPersistentStore.swift */; };
15261502
83B1D037282C62620061D911 /* BloggingPromptsAttribution.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83B1D036282C62620061D911 /* BloggingPromptsAttribution.swift */; };
15271503
83B1D038282C62620061D911 /* BloggingPromptsAttribution.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83B1D036282C62620061D911 /* BloggingPromptsAttribution.swift */; };
15281504
83C972E0281C45AB0049E1FE /* Post+BloggingPrompts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83C972DF281C45AB0049E1FE /* Post+BloggingPrompts.swift */; };
@@ -19959,7 +19935,6 @@
1995919935
3FA53E9D256571D800F4D9A2 /* HomeWidgetCache.swift in Sources */,
1996019936
3FCF66E925CAF8C50047F337 /* ListStatsView.swift in Sources */,
1996119937
83A1B19A28AFE47C00E737AC /* KeychainUtils.swift in Sources */,
19962-
83A1B1BB28AFF15500E737AC /* UserPersistentStore.swift in Sources */,
1996319938
3F6BC06D25B24787007369D3 /* BuildConfiguration.swift in Sources */,
1996419939
3F1FD2502548AD8B0060C53A /* TodayWidgetStats.swift in Sources */,
1996519940
3F2F0C16256C6B2C003351C7 /* StatsWidgetsService.swift in Sources */,
@@ -19983,7 +19958,6 @@
1998319958
3F1FD27B2548AE900060C53A /* CocoaLumberjack.swift in Sources */,
1998419959
3FCF66FB25CAF8E00047F337 /* ListRow.swift in Sources */,
1998519960
8323789828526E6D003F4443 /* AppConfiguration.swift in Sources */,
19986-
83A1B1B328AFF11D00E737AC /* UserPersistentRepository.swift in Sources */,
1998719961
3F8B138F25D09AA5004FAC0A /* WordPressHomeWidgetThisWeek.swift in Sources */,
1998819962
3F5689F0254209790048A9E4 /* SingleStatView.swift in Sources */,
1998919963
3FAA18CC25797B85002B1911 /* UnconfiguredView.swift in Sources */,
@@ -19994,7 +19968,6 @@
1999419968
3FD675D925C87A15009AB3C1 /* Sites.intentdefinition in Sources */,
1999519969
3FE77C8325B0CA89007DE9E5 /* LocalizableStrings.swift in Sources */,
1999619970
3FCC8FD9256C911300810295 /* SFHFKeychainUtils.m in Sources */,
19997-
83A1B1AB28AFF10C00E737AC /* UserPersistentStoreFactory.swift in Sources */,
1999819971
3FE20C3725CF211F00A15525 /* ListViewData.swift in Sources */,
1999919972
3F71D5302548C2B200A4BA93 /* Double+Stats.swift in Sources */,
2000019973
98390AD2254C985F00868F0A /* Tracks.swift in Sources */,
@@ -20067,12 +20040,10 @@
2006720040
isa = PBXSourcesBuildPhase;
2006820041
buildActionMask = 2147483647;
2006920042
files = (
20070-
83A1B1AC28AFF10D00E737AC /* UserPersistentStoreFactory.swift in Sources */,
2007120043
8323789928526E6E003F4443 /* AppConfiguration.swift in Sources */,
2007220044
7345EAC4212DD49400607EC9 /* CircularImageView.swift in Sources */,
2007320045
83A1B19B28AFE47D00E737AC /* KeychainUtils.swift in Sources */,
2007420046
436110DD22C41AFD000773AD /* FeatureFlag.swift in Sources */,
20075-
83A1B1BC28AFF15500E737AC /* UserPersistentStore.swift in Sources */,
2007620047
436110DC22C41ADB000773AD /* UIColor+MurielColors.swift in Sources */,
2007720048
170BEC8A239153160017AEC1 /* FeatureFlagOverrideStore.swift in Sources */,
2007820049
433ADC1B223B2A7E00ED9DE1 /* TextBundleWrapper.m in Sources */,
@@ -20084,7 +20055,6 @@
2008420055
FAD257F52611B54200EDAF88 /* UIColor+WordPressColors.swift in Sources */,
2008520056
73F6DD44212C714F00CE447D /* RichNotificationViewModel.swift in Sources */,
2008620057
736584E6213752730029C9A4 /* SFHFKeychainUtils.m in Sources */,
20087-
83A1B1B428AFF11D00E737AC /* UserPersistentRepository.swift in Sources */,
2008820058
73B05D2621374B960073ECAA /* Tracks.swift in Sources */,
2008920059
1752D4FC238D703A002B79E7 /* KeyValueDatabase.swift in Sources */,
2009020060
FAD2566F2611AEC700EDAF88 /* AppStyleGuide.swift in Sources */,
@@ -20105,10 +20075,8 @@
2010520075
7335AC5C21220AF40012EF2D /* FormattableContentAction.swift in Sources */,
2010620076
7335AC6B21220EF80012EF2D /* DefaultFormattableContentAction.swift in Sources */,
2010720077
7335AC6421220E880012EF2D /* FormattableMediaContent.swift in Sources */,
20108-
83A1B1BD28AFF15600E737AC /* UserPersistentStore.swift in Sources */,
2010920078
7335AC6521220E940012EF2D /* FormattableTextContent.swift in Sources */,
2011020079
7335AC5D21220AFE0012EF2D /* FormattableContentActionCommand.swift in Sources */,
20111-
83A1B1AD28AFF10D00E737AC /* UserPersistentStoreFactory.swift in Sources */,
2011220080
7335AC5A21220AD10012EF2D /* FormattableContentRange.swift in Sources */,
2011320081
7335AC6821220EC10012EF2D /* FormattableCommentContent.swift in Sources */,
2011420082
7335AC6921220ECE0012EF2D /* NotificationCommentRange.swift in Sources */,
@@ -20134,7 +20102,6 @@
2013420102
83A1B19E28AFE86A00E737AC /* FeatureFlag.swift in Sources */,
2013520103
73E8E592212CD635000B26A5 /* UIImage+Assets.swift in Sources */,
2013620104
83A1B1A328AFE89F00E737AC /* BuildConfiguration.swift in Sources */,
20137-
83A1B1B528AFF11E00E737AC /* UserPersistentRepository.swift in Sources */,
2013820105
73E40D8C21238C520012ABA6 /* Tracks+ServiceExtension.swift in Sources */,
2013920106
73768B6B212B4E4F005136A1 /* UNNotificationContent+RemoteNotification.swift in Sources */,
2014020107
73F6DD45212C714F00CE447D /* RichNotificationViewModel.swift in Sources */,
@@ -20149,7 +20116,6 @@
2014920116
74021A21202E173F006CC39F /* TextList+WordPress.swift in Sources */,
2015020117
433ADC19223B2A0200ED9DE1 /* TextBundleWrapper.m in Sources */,
2015120118
74021A07202E1307006CC39F /* UINavigationController+Extensions.swift in Sources */,
20152-
83A1B1B728AFF15300E737AC /* UserPersistentStore.swift in Sources */,
2015320119
74021A1C202E158F006CC39F /* ShareExtensionService.swift in Sources */,
2015420120
747F88C2203778E000523C7C /* ShareTagsPickerViewController.swift in Sources */,
2015520121
7414A142203CD066005A7D9B /* ShareCategoriesPickerViewController.swift in Sources */,
@@ -20160,10 +20126,8 @@
2016020126
74021A19202E14C1006CC39F /* NSAttributedStringKey+Conversion.swift in Sources */,
2016120127
74021A03202E1307006CC39F /* NSExtensionContext+Extensions.swift in Sources */,
2016220128
74021A22202E1740006CC39F /* Header+WordPress.swift in Sources */,
20163-
83A1B1AF28AFF11B00E737AC /* UserPersistentRepository.swift in Sources */,
2016420129
74021A02202E12FF006CC39F /* Extensions.xcdatamodeld in Sources */,
2016520130
FAD256B82611B01B00EDAF88 /* UIColor+WordPressColors.swift in Sources */,
20166-
83A1B1A728AFF10A00E737AC /* UserPersistentStoreFactory.swift in Sources */,
2016720131
740219FF202E12F4006CC39F /* PostUploadOperation.swift in Sources */,
2016820132
9822D8DE214194EB0092CBD1 /* NoResultsViewController.swift in Sources */,
2016920133
74021A1A202E1502006CC39F /* WPStyleGuide+Gridicon.swift in Sources */,
@@ -20239,7 +20203,6 @@
2023920203
741E224B1FC0E5C0007967AB /* UploadOperation.swift in Sources */,
2024020204
43EE90EF223B1029006A33E9 /* TextBundleWrapper.m in Sources */,
2024120205
74EA3B89202A0462004F802D /* ShareNoticeConstants.swift in Sources */,
20242-
83A1B1B628AFF15200E737AC /* UserPersistentStore.swift in Sources */,
2024320206
B50248AF1C96FF6200AFBDED /* WPStyleGuide+Share.swift in Sources */,
2024420207
E1CE41661E8D1026000CF5A4 /* ShareExtractor.swift in Sources */,
2024520208
930F09191C7E1C1E00995926 /* ShareExtensionService.swift in Sources */,
@@ -20250,10 +20213,8 @@
2025020213
74F5CD3A1FE0653500764E7C /* ShareExtensionEditorViewController.swift in Sources */,
2025120214
B5FA868C1D10A4C400AB5F7E /* UIImage+Extensions.swift in Sources */,
2025220215
B50248C21C96FFCC00AFBDED /* WordPressShare-Lumberjack.m in Sources */,
20253-
83A1B1AE28AFF11A00E737AC /* UserPersistentRepository.swift in Sources */,
2025420216
74FA4BE61FBFA0660031EAAD /* Extensions.xcdatamodeld in Sources */,
2025520217
FAD256A62611B01A00EDAF88 /* UIColor+WordPressColors.swift in Sources */,
20256-
83A1B1A628AFF10900E737AC /* UserPersistentStoreFactory.swift in Sources */,
2025720218
74D06FEB1FE0788500AF1788 /* TextList+WordPress.swift in Sources */,
2025820219
74FA2EE4200E8A6C001DDC13 /* AppExtensionsService.swift in Sources */,
2025920220
74F89407202A1965008610FA /* ExtensionNotificationManager.swift in Sources */,
@@ -20313,9 +20274,7 @@
2031320274
buildActionMask = 2147483647;
2031420275
files = (
2031520276
98906507237CC1DF00218CD2 /* WidgetTwoColumnCell.swift in Sources */,
20316-
83A1B1B028AFF11B00E737AC /* UserPersistentRepository.swift in Sources */,
2031720277
433ADC1C223B2A7E00ED9DE1 /* TextBundleWrapper.m in Sources */,
20318-
83A1B1A828AFF10A00E737AC /* UserPersistentStoreFactory.swift in Sources */,
2031920278
93E5284119A7741A003A1A9C /* TodayViewController.swift in Sources */,
2032020279
FAD2566C2611AEC300EDAF88 /* AppStyleGuide.swift in Sources */,
2032120280
938CF3DE1EF1BE8000AF838E /* CocoaLumberjack.swift in Sources */,
@@ -20325,7 +20284,6 @@
2032520284
436110DA22C3ED44000773AD /* FeatureFlag.swift in Sources */,
2032620285
436110DB22C3ED4C000773AD /* BuildConfiguration.swift in Sources */,
2032720286
98906503237CC1DF00218CD2 /* WidgetUnconfiguredCell.swift in Sources */,
20328-
83A1B1B828AFF15300E737AC /* UserPersistentStore.swift in Sources */,
2032920287
93C2075D1CC7FFC800C94D04 /* Tracks+TodayWidget.swift in Sources */,
2033020288
98E58A302360D23400E5534B /* TodayWidgetStats.swift in Sources */,
2033120289
83A1B19728AFE47A00E737AC /* KeychainUtils.swift in Sources */,
@@ -20362,14 +20320,11 @@
2036220320
98712D1F23DA1D0A00555316 /* WidgetNoConnectionCell.swift in Sources */,
2036320321
FAD257F42611B54100EDAF88 /* UIColor+WordPressColors.swift in Sources */,
2036420322
092C3802275E718100BBBDD9 /* AppLocalizedString.swift in Sources */,
20365-
83A1B1AA28AFF10B00E737AC /* UserPersistentStoreFactory.swift in Sources */,
2036620323
8323789728526E6C003F4443 /* AppConfiguration.swift in Sources */,
2036720324
98A3C3052399A2370048D38D /* ThisWeekViewController.swift in Sources */,
20368-
83A1B1BA28AFF15400E737AC /* UserPersistentStore.swift in Sources */,
2036920325
17A4B6A324F911D5002DFB8E /* KeyValueDatabase.swift in Sources */,
2037020326
989643E523A02F640070720A /* MurielColor.swift in Sources */,
2037120327
83A1B19928AFE47B00E737AC /* KeychainUtils.swift in Sources */,
20372-
83A1B1B228AFF11C00E737AC /* UserPersistentRepository.swift in Sources */,
2037320328
983AE84D2399AC6B00E5B7F6 /* Constants.m in Sources */,
2037420329
989643ED23A0437B0070720A /* WidgetDifferenceCell.swift in Sources */,
2037520330
FAD2566E2611AEC600EDAF88 /* AppStyleGuide.swift in Sources */,
@@ -20396,14 +20351,11 @@
2039620351
98712D1E23DA1D0900555316 /* WidgetNoConnectionCell.swift in Sources */,
2039720352
98A6B993239881860031AEBD /* MurielColor.swift in Sources */,
2039820353
092C3801275E718100BBBDD9 /* AppLocalizedString.swift in Sources */,
20399-
83A1B1A928AFF10B00E737AC /* UserPersistentStoreFactory.swift in Sources */,
2040020354
8323789628526E6C003F4443 /* AppConfiguration.swift in Sources */,
2040120355
FAD256EE2611B01F00EDAF88 /* UIColor+WordPressColors.swift in Sources */,
20402-
83A1B1B928AFF15400E737AC /* UserPersistentStore.swift in Sources */,
2040320356
17A4B6A224F911D4002DFB8E /* KeyValueDatabase.swift in Sources */,
2040420357
98D31BC223972A79009CFF43 /* SFHFKeychainUtils.m in Sources */,
2040520358
83A1B19828AFE47B00E737AC /* KeychainUtils.swift in Sources */,
20406-
83A1B1B128AFF11C00E737AC /* UserPersistentRepository.swift in Sources */,
2040720359
98D31BAE239708FB009CFF43 /* Constants.m in Sources */,
2040820360
98C0CE9B23C559C800D0F27C /* Double+Stats.swift in Sources */,
2040920361
FAD2566D2611AEC500EDAF88 /* AppStyleGuide.swift in Sources */,

‎WordPress/WordPressTest/FeatureHighlightStoreTests.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,31 +24,31 @@ final class FeatureHighlightStoreTests: XCTestCase {
2424
}
2525

2626
func testShouldShowTooltipReturnsTrueWhenCounterIsBelow3() {
27-
var sut = FeatureHighlightStore(userDefaults: MockUserDefaults())
27+
var sut = FeatureHighlightStore(userStore: MockUserDefaults())
2828
sut.didDismissTooltip = false
2929
sut.followConversationTooltipCounter = 2
3030

3131
XCTAssert(sut.shouldShowTooltip)
3232
}
3333

3434
func testShouldShowTooltipReturnsFalseWhenCounterIs3() {
35-
var sut = FeatureHighlightStore(userDefaults: MockUserDefaults())
35+
var sut = FeatureHighlightStore(userStore: MockUserDefaults())
3636
sut.didDismissTooltip = false
3737
sut.followConversationTooltipCounter = 3
3838

3939
XCTAssertFalse(sut.shouldShowTooltip)
4040
}
4141

4242
func testShouldShowTooltipReturnsFalseWhenCounterIsBelow3DidDismissIsTrue() {
43-
var sut = FeatureHighlightStore(userDefaults: MockUserDefaults())
43+
var sut = FeatureHighlightStore(userStore: MockUserDefaults())
4444
sut.didDismissTooltip = true
4545
sut.followConversationTooltipCounter = 0
4646

4747
XCTAssertFalse(sut.shouldShowTooltip)
4848
}
4949

5050
func testShouldShowTooltipReturnsFalseWhenCounterIsAbove3DidDismissIsTrue() {
51-
var sut = FeatureHighlightStore(userDefaults: MockUserDefaults())
51+
var sut = FeatureHighlightStore(userStore: MockUserDefaults())
5252
sut.didDismissTooltip = true
5353
sut.followConversationTooltipCounter = 7
5454

0 commit comments

Comments
 (0)