Merge branch 'master' into features/init

youtube · Dec 19, 2016 · 5590c49 · 5590c49
2 parents 4411fcd + cf845f8
commit 5590c49
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/client/cache/cache_test.js b/src/client/cache/cache_test.js
@@ -21,7 +21,7 @@ describe('spf.cache', function() {
     time = { advance: 0 };
     spf.__now = spf.now;
     spf.now = function() {
-      return (+new Date()) + time.advance;
+      return (new Date()).getTime() + time.advance;
     };
     // Reset.
     storage = spf.cache.storage_();

diff --git a/src/client/history/history_test.js b/src/client/history/history_test.js
@@ -50,7 +50,7 @@ describe('spf.history', function() {
     time = { advance: 0 };
     spf.__now = spf.now;
     spf.now = function() {
-      return (+new Date()) + time.advance;
+      return (new Date()).getTime() + time.advance;
     };
     // Init.
     callbacks = {

diff --git a/src/client/nav/request_test.js b/src/client/nav/request_test.js
@@ -920,7 +920,7 @@ describe('spf.nav.request', function() {
     it('regular: single, navigation timing', function() {
       var url = '/page';
       var text = '{}';
-      var startTime = new Date().getTime() - 1;
+      var startTime = spf.now() - 1;
       var fake = createFakeRegularXHR(text);
       spf.net.xhr.get = jasmine.createSpy('xhr.get').and.callFake(fake);
 
@@ -938,7 +938,7 @@ describe('spf.nav.request', function() {
     it('cached: single, navigation timing', function() {
       var url = '/page';
       var res = {'foo': 'FOO', 'bar': 'BAR'};
-      var startTime = new Date().getTime() - 1;
+      var startTime = spf.now() - 1;
 
       var cacheKey = 'prefetch ' + spf.url.absolute(url);
       var cacheObject = {