jasmine-core 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 774cee200c94a97754d9739a092c927bed3c47b5
-  data.tar.gz: 9fffe598451f68c2123a86d668196fc84a1f19ad
+  metadata.gz: 71429fa9b38c528a62e48585cd3be35b71141be6
+  data.tar.gz: d2ad921c951ae5a491c4df73ab4a845095958e51
 SHA512:
-  metadata.gz: d518ed2a10b8238dd7d96fb65e5249007d7b8fc6fd94412e4597f0c8cd6aa27e73d06073c7da3e6d91cd17b80015dd9f9e7c6cbfa4bd4d24325c151e787144b4
-  data.tar.gz: 5724768ad8f93bd18e26956316aad9b28fd797cb1d3142bf2f17ce7e94a95861cf2f82e5282ecd5437bfc3d224f7b0fe49b91e4ab76493417441c44d032dcf17
+  metadata.gz: f3b14ae8fb70a0389d96d21c6d341a1778e6716d641f0d4c522420892423487687644815506784c4f4ce85e5475066e0b68b5a3b4643291bfe64f5e3412d2074
+  data.tar.gz: 21a4d63fb89569f3175c4f0dc4be4f208d48acf35f3aca33f41337340dd42bd9d479c761abef3cc979869660994fc115cbf67254c5b88f8941aa4ea126b312ae

data/lib/jasmine-core/jasmine.js

@@ -67,7 +67,7 @@ var getJasmineRequireObj = (function (jasmineGlobal) {
     j$.ReportDispatcher = jRequire.ReportDispatcher();
     j$.Spec = jRequire.Spec(j$);
     j$.SpyRegistry = jRequire.SpyRegistry(j$);
-    j$.SpyStrategy = jRequire.SpyStrategy();
+    j$.SpyStrategy = jRequire.SpyStrategy(j$);
     j$.StringMatching = jRequire.StringMatching(j$);
     j$.Suite = jRequire.Suite(j$);
     j$.Timer = jRequire.Timer();
@@ -147,6 +147,10 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) {
     return j$.isA_('Number', value);
   };
 
+  j$.isFunction_ = function(value) {
+    return j$.isA_('Function', value);
+  };
+
   j$.isA_ = function(typeName, value) {
     return Object.prototype.toString.apply(value) === '[object ' + typeName + ']';
   };
@@ -788,6 +792,10 @@ getJasmineRequireObj().Env = function(j$) {
       reporter.provideFallbackReporter(reporterToAdd);
     };
 
+    this.clearReporters = function() {
+      reporter.clearReporters();
+    };
+
     var spyRegistry = new j$.SpyRegistry({currentSpies: function() {
       if(!currentRunnable()) {
         throw new Error('Spies must be created in a before function or a spec');
@@ -2013,11 +2021,14 @@ getJasmineRequireObj().ReportDispatcher = function() {
     this.addReporter = function(reporter) {
       reporters.push(reporter);
     };
-    
+
     this.provideFallbackReporter = function(reporter) {
       fallbackReporter = reporter;
     };
 
+    this.clearReporters = function() {
+      reporters = [];
+    };
 
     return this;
 
@@ -2120,7 +2131,7 @@ getJasmineRequireObj().SpyRegistry = function(j$) {
   return SpyRegistry;
 };
 
-getJasmineRequireObj().SpyStrategy = function() {
+getJasmineRequireObj().SpyStrategy = function(j$) {
 
   function SpyStrategy(options) {
     options = options || {};
@@ -2167,7 +2178,7 @@ getJasmineRequireObj().SpyStrategy = function() {
     };
 
     this.callFake = function(fn) {
-      if(!(fn instanceof Function)) {
+      if(!j$.isFunction_(fn)) {
         throw new Error('Argument passed to callFake should be a function, got ' + fn);
       }
       plan = fn;
@@ -3640,5 +3651,5 @@ getJasmineRequireObj().interface = function(jasmine, env) {
 };
 
 getJasmineRequireObj().version = function() {
-  return '2.5.1';
+  return '2.5.2';
 };

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

@@ -45,7 +45,6 @@ describe("ReportDispatcher", function() {
     dispatcher.provideFallbackReporter(reporter);
     dispatcher.foo(123, 456);
     expect(reporter.foo).toHaveBeenCalledWith(123, 456);
-
   });
 
   it("does not call fallback reporting methods when another report is provided", function() {
@@ -59,6 +58,22 @@ describe("ReportDispatcher", function() {
 
     expect(reporter.foo).toHaveBeenCalledWith(123, 456);
     expect(fallbackReporter.foo).not.toHaveBeenCalledWith(123, 456);
+  });
+
+  it("allows registered reporters to be cleared", function() {
+    var dispatcher = new jasmineUnderTest.ReportDispatcher(['foo', 'bar']),
+        reporter1 = jasmine.createSpyObj('reporter1', ['foo', 'bar']),
+        reporter2 = jasmine.createSpyObj('reporter2', ['foo', 'bar']);
+
+    dispatcher.addReporter(reporter1);
+    dispatcher.foo(123);
+    expect(reporter1.foo).toHaveBeenCalledWith(123);
+
+    dispatcher.clearReporters();
+    dispatcher.addReporter(reporter2);
+    dispatcher.bar(456);
 
+    expect(reporter1.bar).not.toHaveBeenCalled();
+    expect(reporter2.bar).toHaveBeenCalledWith(456);
   });
 });

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

@@ -94,14 +94,14 @@ describe("SpyStrategy", function() {
 
   it('throws an error when a non-function is passed to callFake strategy', function() {
     var originalFn = jasmine.createSpy('original'),
+        spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn}),
         invalidFakes = [5, 'foo', {}, true, false, null, void 0, new Date(), /.*/];
 
-    for (var i=0; i<invalidFakes.length; i++) {
-      var invalidFake = invalidFakes[i],
-          spyStrategy = new jasmineUnderTest.SpyStrategy({fn: originalFn});
+    spyOn(jasmineUnderTest, 'isFunction_').and.returnValue(false);
 
-      expect(function() {spyStrategy.callFake(invalidFake);}).toThrowError('Argument passed to callFake should be a function, got ' + invalidFake);
-    }
+    expect(function () {
+      spyStrategy.callFake(function() {});
+    }).toThrowError(/^Argument passed to callFake should be a function, got/);
   });
 
   it("allows a return to plan stubbing after another strategy", function() {

data/lib/jasmine-core/version.rb

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

metadata

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