diff --git a/Clocker/ClockerUnitTests/EventInfoTests.swift b/Clocker/ClockerUnitTests/EventInfoTests.swift index cc116c0..eda12f9 100644 --- a/Clocker/ClockerUnitTests/EventInfoTests.swift +++ b/Clocker/ClockerUnitTests/EventInfoTests.swift @@ -76,4 +76,32 @@ class EventInfoTests: XCTestCase { XCTAssert(mockEventInfo.metadataForMeeting() == "in 25h", "Metadata for meeting: \(mockEventInfo.metadataForMeeting()) doesn't match expectation") } + + func testMetadataForEventHappeningAfterAnHour() throws { + let pastChunk = TimeChunk(seconds: 10, minutes: 10, hours: 1, days: 0, weeks: 0, months: 0, years: 0) + let mockEvent = EKEvent(eventStore: eventStore) + mockEvent.title = "Mock Title" + mockEvent.startDate = Date().add(pastChunk) + + let mockEventInfo = EventInfo(event: mockEvent, + isAllDay: false, + meetingURL: nil, + attendeStatus: .accepted) + XCTAssert(mockEventInfo.metadataForMeeting() == "in 1h", + "Metadata for meeting: \(mockEventInfo.metadataForMeeting()) doesn't match expectation") + } + + func testMetadataForEventHappeningAfterThreeHours() throws { + let pastChunk = TimeChunk(seconds: 10, minutes: 10, hours: 3, days: 0, weeks: 0, months: 0, years: 0) + let mockEvent = EKEvent(eventStore: eventStore) + mockEvent.title = "Mock Title" + mockEvent.startDate = Date().add(pastChunk) + + let mockEventInfo = EventInfo(event: mockEvent, + isAllDay: false, + meetingURL: nil, + attendeStatus: .accepted) + XCTAssert(mockEventInfo.metadataForMeeting() == "in 3h", + "Metadata for meeting: \(mockEventInfo.metadataForMeeting()) doesn't match expectation") + } } diff --git a/Clocker/Dependencies/Date Additions/Date+TimeAgo.swift b/Clocker/Dependencies/Date Additions/Date+TimeAgo.swift index 7fd1bde..0bef889 100755 --- a/Clocker/Dependencies/Date Additions/Date+TimeAgo.swift +++ b/Clocker/Dependencies/Date Additions/Date+TimeAgo.swift @@ -113,7 +113,7 @@ public extension Date { return DateToolsLocalizedStrings("1 hour ago") } - return DateToolsLocalizedStrings("An hour ago") + return DateToolsLocalizedStrings("1h ago") } else if components.minute! >= 2 { return logicalLocalizedStringFromFormat(format: "%%d%@m ago", value: components.minute!) } else if components.minute! >= 1 {