Skip to content

Commit 5f70e20

Browse files
itsmeichigoitsmeichigo
committed
Fix unit test build failure and some typos
1 parent 23b5b39 commit 5f70e20

File tree

3 files changed

+56
-13
lines changed

3 files changed

+56
-13
lines changed

‎Storage/StorageTests/Model/AppSettings/GeneralAppSettingsTests.swift‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ final class GeneralAppSettingsTests: XCTestCase {
6565
isStripeInPersonPaymentsSwitchEnabled: true,
6666
isCanadaInPersonPaymentsSwitchEnabled: true,
6767
isProductSKUInputScannerSwitchEnabled: true,
68+
isCouponManagementSwitchEnabled: true,
6869
knownCardReaders: readers,
6970
lastEligibilityErrorInfo: eligibilityInfo,
7071
lastJetpackBenefitsBannerDismissedTime: jetpackBannerDismissedDate)
@@ -87,6 +88,7 @@ final class GeneralAppSettingsTests: XCTestCase {
8788
assertEqual(newSettings.isStripeInPersonPaymentsSwitchEnabled, true)
8889
assertEqual(newSettings.isCanadaInPersonPaymentsSwitchEnabled, true)
8990
assertEqual(newSettings.isProductSKUInputScannerSwitchEnabled, true)
91+
assertEqual(newSettings.isCouponManagementSwitchEnabled, true)
9092
assertEqual(newSettings.lastJetpackBenefitsBannerDismissedTime, jetpackBannerDismissedDate)
9193
}
9294
}
@@ -99,6 +101,7 @@ private extension GeneralAppSettingsTests {
99101
isStripeInPersonPaymentsSwitchEnabled: Bool = false,
100102
isCanadaInPersonPaymentsSwitchEnabled: Bool = false,
101103
isProductSKUInputScannerSwitchEnabled: Bool = false,
104+
isCouponManagementSwitchEnabled: Bool = false,
102105
knownCardReaders: [String] = [],
103106
lastEligibilityErrorInfo: EligibilityErrorInfo? = nil,
104107
lastJetpackBenefitsBannerDismissedTime: Date? = nil) -> GeneralAppSettings {
@@ -109,6 +112,7 @@ private extension GeneralAppSettingsTests {
109112
isStripeInPersonPaymentsSwitchEnabled: isStripeInPersonPaymentsSwitchEnabled,
110113
isCanadaInPersonPaymentsSwitchEnabled: isCanadaInPersonPaymentsSwitchEnabled,
111114
isProductSKUInputScannerSwitchEnabled: isProductSKUInputScannerSwitchEnabled,
115+
isCouponManagementSwitchEnabled: isCouponManagementSwitchEnabled,
112116
knownCardReaders: knownCardReaders,
113117
lastEligibilityErrorInfo: lastEligibilityErrorInfo,
114118
lastJetpackBenefitsBannerDismissedTime: lastJetpackBenefitsBannerDismissedTime)

‎Yosemite/YosemiteTests/Stores/AppSettings/InAppFeedbackCardVisibilityUseCaseTests.swift‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ final class InAppFeedbackCardVisibilityUseCaseTests: XCTestCase {
3737

3838
fileManager.whenRetrievingAttributesOfItem(atPath: try documentDirectoryURL().path, thenReturn: [:])
3939

40-
let settings = createAppSetting(instalationDate: installationDate, feedbackType: .general, feedbackSatus: .pending)
40+
let settings = createAppSetting(installationDate: installationDate, feedbackType: .general, feedbackStatus: .pending)
4141
let useCase = InAppFeedbackCardVisibilityUseCase(settings: settings, feedbackType: .general, fileManager: fileManager, calendar: calendar)
4242

4343
// When
@@ -54,7 +54,7 @@ final class InAppFeedbackCardVisibilityUseCaseTests: XCTestCase {
5454

5555
fileManager.whenRetrievingAttributesOfItem(atPath: try documentDirectoryURL().path, thenReturn: [:])
5656

57-
let settings = createAppSetting(instalationDate: installationDate, feedbackType: .general, feedbackSatus: .pending)
57+
let settings = createAppSetting(installationDate: installationDate, feedbackType: .general, feedbackStatus: .pending)
5858
let useCase = InAppFeedbackCardVisibilityUseCase(settings: settings, feedbackType: .general, fileManager: fileManager, calendar: calendar)
5959

6060
// When
@@ -72,7 +72,7 @@ final class InAppFeedbackCardVisibilityUseCaseTests: XCTestCase {
7272

7373
fileManager.whenRetrievingAttributesOfItem(atPath: try documentDirectoryURL().path, thenReturn: [:])
7474

75-
let settings = createAppSetting(instalationDate: installationDate, feedbackType: .general, feedbackSatus: .given(lastFeedbackDate))
75+
let settings = createAppSetting(installationDate: installationDate, feedbackType: .general, feedbackStatus: .given(lastFeedbackDate))
7676
let useCase = InAppFeedbackCardVisibilityUseCase(settings: settings, feedbackType: .general, fileManager: fileManager, calendar: calendar)
7777

7878
// When
@@ -90,7 +90,7 @@ final class InAppFeedbackCardVisibilityUseCaseTests: XCTestCase {
9090

9191
fileManager.whenRetrievingAttributesOfItem(atPath: try documentDirectoryURL().path, thenReturn: [:])
9292

93-
let settings = createAppSetting(instalationDate: installationDate, feedbackType: .general, feedbackSatus: .given(lastFeedbackDate))
93+
let settings = createAppSetting(installationDate: installationDate, feedbackType: .general, feedbackStatus: .given(lastFeedbackDate))
9494
let useCase = InAppFeedbackCardVisibilityUseCase(settings: settings, feedbackType: .general, fileManager: fileManager, calendar: calendar)
9595

9696
// When
@@ -108,7 +108,7 @@ final class InAppFeedbackCardVisibilityUseCaseTests: XCTestCase {
108108
fileManager.whenRetrievingAttributesOfItem(atPath: try documentDirectoryURL().path,
109109
thenReturn: [.creationDate: documentDirCreationDate])
110110

111-
let settings = createAppSetting(instalationDate: nil, feedbackType: .general, feedbackSatus: .pending)
111+
let settings = createAppSetting(installationDate: nil, feedbackType: .general, feedbackStatus: .pending)
112112
let useCase = InAppFeedbackCardVisibilityUseCase(settings: settings, feedbackType: .general, fileManager: fileManager, calendar: calendar)
113113

114114
// When
@@ -128,7 +128,7 @@ final class InAppFeedbackCardVisibilityUseCaseTests: XCTestCase {
128128
fileManager.whenRetrievingAttributesOfItem(atPath: try documentDirectoryURL().path,
129129
thenReturn: [.creationDate: documentDirCreationDate])
130130

131-
let settings = createAppSetting(instalationDate: installationDate, feedbackType: .general, feedbackSatus: .pending)
131+
let settings = createAppSetting(installationDate: installationDate, feedbackType: .general, feedbackStatus: .pending)
132132
let useCase = InAppFeedbackCardVisibilityUseCase(settings: settings, feedbackType: .general, fileManager: fileManager, calendar: calendar)
133133

134134
// When
@@ -142,7 +142,7 @@ final class InAppFeedbackCardVisibilityUseCaseTests: XCTestCase {
142142
// Given
143143
fileManager.whenRetrievingAttributesOfItem(atPath: try documentDirectoryURL().path, thenReturn: [:])
144144

145-
let settings = createAppSetting(instalationDate: nil, feedbackType: .general, feedbackSatus: .pending)
145+
let settings = createAppSetting(installationDate: nil, feedbackType: .general, feedbackStatus: .pending)
146146
let useCase = InAppFeedbackCardVisibilityUseCase(settings: settings, feedbackType: .general, fileManager: fileManager, calendar: calendar)
147147

148148
// When
@@ -163,6 +163,7 @@ final class InAppFeedbackCardVisibilityUseCaseTests: XCTestCase {
163163
isStripeInPersonPaymentsSwitchEnabled: false,
164164
isCanadaInPersonPaymentsSwitchEnabled: false,
165165
isProductSKUInputScannerSwitchEnabled: false,
166+
isCouponManagementSwitchEnabled: false,
166167
knownCardReaders: [])
167168
let useCase = InAppFeedbackCardVisibilityUseCase(settings: settings, feedbackType: .productsVariations)
168169

@@ -175,7 +176,7 @@ final class InAppFeedbackCardVisibilityUseCaseTests: XCTestCase {
175176

176177
func test_shouldBeVisible_for_productM5_is_true_if_feedback_has_pending_status() throws {
177178
// Given
178-
let settings = createAppSetting(instalationDate: nil, feedbackType: .productsVariations, feedbackSatus: .pending)
179+
let settings = createAppSetting(installationDate: nil, feedbackType: .productsVariations, feedbackStatus: .pending)
179180
let useCase = InAppFeedbackCardVisibilityUseCase(settings: settings, feedbackType: .productsVariations)
180181

181182
// When
@@ -187,7 +188,7 @@ final class InAppFeedbackCardVisibilityUseCaseTests: XCTestCase {
187188

188189
func test_shouldBeVisible_for_productM5_is_false_if_feedback_has_dismissed_status() throws {
189190
// Given
190-
let settings = createAppSetting(instalationDate: nil, feedbackType: .productsVariations, feedbackSatus: .dismissed)
191+
let settings = createAppSetting(installationDate: nil, feedbackType: .productsVariations, feedbackStatus: .dismissed)
191192
let useCase = InAppFeedbackCardVisibilityUseCase(settings: settings, feedbackType: .productsVariations)
192193

193194
// When
@@ -199,7 +200,7 @@ final class InAppFeedbackCardVisibilityUseCaseTests: XCTestCase {
199200

200201
func test_shouldBeVisible_for_productM5_is_false_if_feedback_has_given_status() throws {
201202
// Given
202-
let settings = createAppSetting(instalationDate: nil, feedbackType: .productsVariations, feedbackSatus: .given(Date()))
203+
let settings = createAppSetting(installationDate: nil, feedbackType: .productsVariations, feedbackStatus: .given(Date()))
203204
let useCase = InAppFeedbackCardVisibilityUseCase(settings: settings, feedbackType: .productsVariations)
204205

205206
// When
@@ -221,16 +222,17 @@ private extension InAppFeedbackCardVisibilityUseCaseTests {
221222
try XCTUnwrap(FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).last)
222223
}
223224

224-
func createAppSetting(instalationDate: Date?, feedbackType: FeedbackType, feedbackSatus: FeedbackSettings.Status) -> GeneralAppSettings {
225-
let feedback = FeedbackSettings(name: feedbackType, status: feedbackSatus)
225+
func createAppSetting(installationDate: Date?, feedbackType: FeedbackType, feedbackStatus: FeedbackSettings.Status) -> GeneralAppSettings {
226+
let feedback = FeedbackSettings(name: feedbackType, status: feedbackStatus)
226227
let settings = GeneralAppSettings(
227-
installationDate: instalationDate,
228+
installationDate: installationDate,
228229
feedbacks: [feedback.name: feedback],
229230
isViewAddOnsSwitchEnabled: false,
230231
isOrderCreationSwitchEnabled: false,
231232
isStripeInPersonPaymentsSwitchEnabled: false,
232233
isCanadaInPersonPaymentsSwitchEnabled: false,
233234
isProductSKUInputScannerSwitchEnabled: false,
235+
isCouponManagementSwitchEnabled: false,
234236
knownCardReaders: []
235237
)
236238
return settings

‎Yosemite/YosemiteTests/Stores/AppSettingsStoreTests.swift‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -679,6 +679,42 @@ final class AppSettingsStoreTests: XCTestCase {
679679
XCTAssertTrue(isEnabled)
680680
}
681681

682+
func test_loadCouponManagementFeatureSwitchState_returns_false_on_new_generalAppSettings() throws {
683+
// Given
684+
try fileStorage?.deleteFile(at: expectedGeneralAppSettingsFileURL)
685+
686+
// When
687+
let result: Result<Bool, Error> = waitFor { promise in
688+
let action = AppSettingsAction.loadCouponManagementFeatureSwitchState { result in
689+
promise(result)
690+
}
691+
self.subject?.onAction(action)
692+
}
693+
694+
// Then
695+
let isEnabled = try result.get()
696+
XCTAssertFalse(isEnabled)
697+
}
698+
699+
func test_loadCouponManagementFeatureSwitchState_returns_true_after_updating_switch_state_to_true() throws {
700+
// Given
701+
try fileStorage?.deleteFile(at: expectedGeneralAppSettingsFileURL)
702+
let updateAction = AppSettingsAction.setCouponManagementFeatureSwitchState(isEnabled: true, onCompletion: { _ in })
703+
subject?.onAction(updateAction)
704+
705+
// When
706+
let result: Result<Bool, Error> = waitFor { promise in
707+
let action = AppSettingsAction.loadCouponManagementFeatureSwitchState { result in
708+
promise(result)
709+
}
710+
self.subject?.onAction(action)
711+
}
712+
713+
// Then
714+
let isEnabled = try result.get()
715+
XCTAssertTrue(isEnabled)
716+
}
717+
682718
// MARK: - General Store Settings
683719

684720
func test_saving_isTelemetryAvailable_works_correctly() throws {
@@ -877,6 +913,7 @@ private extension AppSettingsStoreTests {
877913
isStripeInPersonPaymentsSwitchEnabled: false,
878914
isCanadaInPersonPaymentsSwitchEnabled: false,
879915
isProductSKUInputScannerSwitchEnabled: false,
916+
isCouponManagementSwitchEnabled: false,
880917
knownCardReaders: []
881918
)
882919
return (settings, feedback)

0 commit comments

Comments
 (0)