jasmine-core 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53b9747ec8f9f68a92d930d1c1fd9985e0fe2b13
-  data.tar.gz: f902b066456e9891319425365eb964858313fcc6
+  metadata.gz: 774cee200c94a97754d9739a092c927bed3c47b5
+  data.tar.gz: 9fffe598451f68c2123a86d668196fc84a1f19ad
 SHA512:
-  metadata.gz: 44b3b65e99e332064a6c8b0cd1568cac8226c74daa2a6690a830a6a57fbdfd21994542fb5be234b69dfa61567be9509d92ed83c2b4f75b183233cd87870ef414
-  data.tar.gz: 7ce561e476521b3bc09d7fb5d4f87c8c1e0928c025fa315e3262b2fa7f70f2df4abe5945ec5db6412cac331488a73de3492f91677f1d7d5731a660e487c6332d
+  metadata.gz: d518ed2a10b8238dd7d96fb65e5249007d7b8fc6fd94412e4597f0c8cd6aa27e73d06073c7da3e6d91cd17b80015dd9f9e7c6cbfa4bd4d24325c151e787144b4
+  data.tar.gz: 5724768ad8f93bd18e26956316aad9b28fd797cb1d3142bf2f17ce7e94a95861cf2f82e5282ecd5437bfc3d224f7b0fe49b91e4ab76493417441c44d032dcf17

data/lib/jasmine-core/jasmine.js

@@ -1428,7 +1428,7 @@ getJasmineRequireObj().DelayedFunctionScheduler = function() {
     function runScheduledFunctions(endTime, tickDate) {
       tickDate = tickDate || function() {};
       if (scheduledLookup.length === 0 || scheduledLookup[0] > endTime) {
-        tickDate(endTime);
+        tickDate(endTime - currentTime);
         return;
       }
 
@@ -1455,6 +1455,11 @@ getJasmineRequireObj().DelayedFunctionScheduler = function() {
               // scheduled in a funcToRun from forcing an extra iteration
                  currentTime !== endTime  &&
                  scheduledLookup[0] <= endTime);
+
+      // ran out of functions to call, but still time left on the clock
+      if (currentTime !== endTime) {
+        tickDate(endTime - currentTime);
+      }
     }
   }
 
@@ -2088,7 +2093,9 @@ getJasmineRequireObj().SpyRegistry = function(j$) {
         };
       } else {
         restoreStrategy = function() {
-          delete obj[methodName];
+          if (!delete obj[methodName]) {
+            obj[methodName] = originalMethod;
+          }
         };
       }
 
@@ -2984,16 +2991,20 @@ getJasmineRequireObj().matchersUtil = function(j$) {
       }
 
       var extraKeys = [];
-      for (var i in allKeys) {
-        if (!allKeys[i].match(/^[0-9]+$/)) {
-          extraKeys.push(allKeys[i]);
-        }
+      if (allKeys.length === 0) {
+          return allKeys;
+      }
+
+      for (var x = 0; x < allKeys.length; x++) {
+          if (!allKeys[x].match(/^[0-9]+$/)) {
+              extraKeys.push(allKeys[x]);
+          }
       }
 
       return extraKeys;
     }
   }
-  
+
   function has(obj, key) {
     return Object.prototype.hasOwnProperty.call(obj, key);
   }
@@ -3629,5 +3640,5 @@ getJasmineRequireObj().interface = function(jasmine, env) {
 };
 
 getJasmineRequireObj().version = function() {
-  return '2.5.0';
+  return '2.5.1';
 };

data/lib/jasmine-core/spec/core/ClockSpec.js

@@ -666,9 +666,17 @@ describe("Clock (acceptance)", function() {
     var pushCurrentTime = function() { actualTimes.push(global.Date().getTime()); };
     delayedFunctionScheduler.scheduleFunction(pushCurrentTime);
     delayedFunctionScheduler.scheduleFunction(pushCurrentTime, 1);
+    delayedFunctionScheduler.scheduleFunction(pushCurrentTime, 3);
 
     clock.tick(1);
+    expect(global.Date().getTime()).toEqual(baseTime.getTime() + 1);
 
-    expect(actualTimes).toEqual([baseTime.getTime(), baseTime.getTime() + 1]);
+    clock.tick(3);
+    expect(global.Date().getTime()).toEqual(baseTime.getTime() + 4);
+
+    clock.tick(1);
+    expect(global.Date().getTime()).toEqual(baseTime.getTime() + 5);
+
+    expect(actualTimes).toEqual([baseTime.getTime(), baseTime.getTime() + 1, baseTime.getTime() + 3]);
   })
 });

data/lib/jasmine-core/spec/core/SpyRegistrySpec.js

@@ -127,6 +127,29 @@ describe("SpyRegistry", function() {
 
       expect(subject.hasOwnProperty('spiedFunc')).toBe(false);
       expect(subject.spiedFunc).toBe(originalFunction);
-    })
+    });
+
+    it("restores the original function when it\'s inherited and cannot be deleted", function() {
+      // IE 8 doesn't support `Object.create` or `Object.defineProperty`
+      if (jasmine.getEnv().ieVersion < 9) { return; }
+
+      var spies = [],
+        spyRegistry = new jasmineUnderTest.SpyRegistry({currentSpies: function() { return spies; }}),
+        originalFunction = function() {},
+        subjectParent = {spiedFunc: originalFunction};
+
+      var subject = Object.create(subjectParent);
+
+      spyRegistry.spyOn(subject, 'spiedFunc');
+
+      // simulate a spy that cannot be deleted
+      Object.defineProperty(subject, 'spiedFunc', {
+        configurable: false
+      });
+
+      spyRegistry.clearSpies();
+
+      expect(jasmineUnderTest.isSpy(subject.spiedFunc)).toBe(false);
+    });
   });
 });

data/lib/jasmine-core/version.rb

@@ -4,6 +4,6 @@
 #
 module Jasmine
   module Core
-    VERSION = "2.5.0"
+    VERSION = "2.5.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine-core
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Rajan Agaskar
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake