Skip to content

Fix Expire date issues that screwed up tests on older devices. #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vadymmarkov merged 3 commits into from
Mar 29, 2016
Merged

Fix Expire date issues that screwed up tests on older devices. #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5cd3533
Modify returns date by adding time interval
Mar 28, 2016
255adbc
Revert change
Mar 28, 2016
81ccfa7
Fix Expiry.Never
Mar 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Source/Shared/DataStructures/Expiry.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ public enum Expiry {

switch self {
case .Never:
result = NSDate.distantFuture()
// Ref: http://lists.apple.com/archives/cocoa-dev/2005/Apr/msg01833.html
result = NSDate(timeIntervalSince1970: 60 * 60 * 24 * 365 * 68)
case .Seconds(let seconds):
result = NSDate().dateByAddingTimeInterval(seconds)
case .Date(let date):
Expand All @@ -19,4 +20,4 @@ public enum Expiry {

return result
}
}
}
2 changes: 1 addition & 1 deletion Tests/iOS/Specs/DataStructures/ExpirySpec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class ExpirySpec: QuickSpec {

describe("#date") {
it("returns date in the distant future") {
let date = NSDate.distantFuture()
let date = NSDate(timeIntervalSince1970: 60 * 60 * 24 * 365 * 68)
expiry = .Never

expect(expiry.date).to(equal(date))
Expand Down