diff --git a/Nudge/Utilities/Utils.swift b/Nudge/Utilities/Utils.swift index 66229c76..9bfd318d 100644 --- a/Nudge/Utilities/Utils.swift +++ b/Nudge/Utilities/Utils.swift @@ -396,7 +396,7 @@ struct ConfigurationManager { } struct DateManager { - private let dateFormatterISO8601: DateFormatter = { + let dateFormatterISO8601: DateFormatter = { let formatter = DateFormatter() formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'" formatter.locale = Locale(identifier: "en_US_POSIX") diff --git a/NudgeTests/NudgeTests.swift b/NudgeTests/NudgeTests.swift index 57e3c508..5b437a7f 100644 --- a/NudgeTests/NudgeTests.swift +++ b/NudgeTests/NudgeTests.swift @@ -14,10 +14,7 @@ var defaultPreferencesForTests = [:] as [String : Any] class NudgeTests: XCTestCase { func coerceStringToDate(dateString: String) -> Date { - let dateFormatter = DateFormatter() - dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'" - let formattedDate = dateFormatter.date(from: dateString) ?? DateManager().getCurrentDate() - return formattedDate + DateManager().dateFormatterISO8601.date(from: dateString) ?? DateManager().getCurrentDate() } override func setUp() { @@ -89,7 +86,7 @@ class NudgeTests: XCTestCase { defaultPreferencesForTests["requiredMinimumOSVersion"] = "99.99.99" PrefsWrapper.prefsOverride = defaultPreferencesForTests XCTAssertEqual( - coerceStringToDate(dateString: "2022-01-03T00:00:00Z"), + coerceStringToDate(dateString: "2022-01-02T00:30:00Z"), AppStateManager().gracePeriodLogic( currentDate: coerceStringToDate(dateString: "2022-01-02T00:30:00Z"), testFileDate: coerceStringToDate(dateString: "2022-01-02T00:00:00Z")