jasmine-core 2.3.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98176a36588bb9db3608725662a81381a2e30c94
-  data.tar.gz: 549b65f83c96c7a08bdfd73cfad35520a48bce5a
+  metadata.gz: d24f7f96232424dad8c2d9c174d0bab476f74111
+  data.tar.gz: 40f8739c8a64f21dc86a27dab1a088acf0f641d4
 SHA512:
-  metadata.gz: e1feb4daf3115deb475db3b8721a3c7f041ef3b68b955148f31d02d6684b810b3ae5a31c2234dde15cc1895e3ea6e3cb02d72ba1c1c0d579429d7768b92e4dcf
-  data.tar.gz: 1fbe5447fbd1c40bf0be919d4196b640d4c4df6469340f3840ad34989f6b7e9f7880f63bee407200568566145a5492b6bf8e4714ccfca420bb564e1b05f7f5f7
+  metadata.gz: 478644acf536f00f11a12f263561713c27b53657791f6a864922ff0efc190a8052b71d436932f631c89754c661f76276db482af1ec1ffe067e8283347eddb434
+  data.tar.gz: 2c466f05576e942f9e4ed81b94a9059174e076028f70b9dcef3314d17bd557f7b02c87b215c9f86f1ebb56449d8811be6b7c36aec06895c3dc188075a3fa594e

data/lib/jasmine-core/jasmine.js

@@ -342,7 +342,7 @@ getJasmineRequireObj().Spec = function(j$) {
 
     this.onStart(this);
 
-    if (!this.isExecutable() || enabled === false) {
+    if (!this.isExecutable() || this.markedPending || enabled === false) {
       complete(enabled);
       return;
     }
@@ -419,7 +419,7 @@ getJasmineRequireObj().Spec = function(j$) {
   };
 
   Spec.prototype.isExecutable = function() {
-    return !this.disabled && !this.markedPending;
+    return !this.disabled;
   };
 
   Spec.prototype.getFullName = function() {
@@ -3294,5 +3294,5 @@ getJasmineRequireObj().interface = function(jasmine, env) {
 };
 
 getJasmineRequireObj().version = function() {
-  return '2.3.0';
+  return '2.3.2';
 };

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

@@ -119,7 +119,6 @@ describe("Spec", function() {
         queueRunnerFactory: fakeQueueRunner
       });
 
-
     expect(spec.status()).toBe('pending');
   });
 
@@ -402,13 +401,13 @@ describe("Spec", function() {
     expect(spec.isExecutable()).toBe(false);
   });
 
-  it("should not be executable when pending", function() {
+  it("should be executable when pending", function() {
     var spec = new j$.Spec({
       queueableFn: { fn: function() {} }
     });
     spec.pend();
 
-    expect(spec.isExecutable()).toBe(false);
+    expect(spec.isExecutable()).toBe(true);
   });
 
   it("should be executable when not disabled or pending", function() {

data/lib/jasmine-core/spec/core/integration/EnvSpec.js

@@ -1134,6 +1134,27 @@ describe("Env integration", function() {
       });
 
       expect(reporter.specDone.calls.count()).toBe(5);
+
+      expect(reporter.specDone).toHaveBeenCalledWith(jasmine.objectContaining({
+        description: 'with a top level spec',
+        status: 'passed'
+      }));
+
+      expect(reporter.specDone).toHaveBeenCalledWith(jasmine.objectContaining({
+        description: "with an x'ed spec",
+        status: 'pending'
+      }));
+
+      expect(reporter.specDone).toHaveBeenCalledWith(jasmine.objectContaining({
+        description: 'with a spec',
+        status: 'failed'
+      }));
+
+      expect(reporter.specDone).toHaveBeenCalledWith(jasmine.objectContaining({
+        description: 'is pending',
+        status: 'pending'
+      }));
+
       var suiteResult = reporter.suiteStarted.calls.argsFor(0)[0];
       expect(suiteResult.description).toEqual("A Suite");
 
@@ -1147,7 +1168,7 @@ describe("Env integration", function() {
         env.expect(true).toBe(true);
       });
       env.describe("with a nested suite", function() {
-        env.xit("with a pending spec", function() {
+        env.xit("with an x'ed spec", function() {
           env.expect(true).toBe(true);
         });
         env.it("with a spec", function() {
@@ -1155,9 +1176,9 @@ describe("Env integration", function() {
         });
       });
 
-      env.describe('with only pending specs', function() {
+      env.describe('with only non-executable specs', function() {
         env.it('is pending');
-        env.xit('is pending', function() {
+        env.xit('is xed', function() {
           env.expect(true).toBe(true);
         });
       });

data/lib/jasmine-core/version.rb

@@ -4,6 +4,6 @@
 #
 module Jasmine
   module Core
-    VERSION = "2.3.0"
+    VERSION = "2.3.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine-core
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.2
 platform: ruby
 authors:
 - Rajan Agaskar
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake