Merge pull request #28 from hyperoslo/fix/tests

Fix Expire date issues that screwed up tests on older devices.
hyperoslo · Mar 29, 2016 · 3fa1306 · 3fa1306
2 parents a851ce8 + 81ccfa7
commit 3fa1306
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Source/Shared/DataStructures/Expiry.swift b/Source/Shared/DataStructures/Expiry.swift
@@ -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):
@@ -19,4 +20,4 @@ public enum Expiry {
 
     return result
   }
-}
+}
diff --git a/Tests/iOS/Specs/DataStructures/ExpirySpec.swift b/Tests/iOS/Specs/DataStructures/ExpirySpec.swift
@@ -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))