jasmine-core 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11370b29a71513e229564a65085361843d7bb6f8
-  data.tar.gz: c650cbac646a9040b7fe91b3d2245817d7a2b552
+  metadata.gz: 5e03261d7c9a4a269e5bc90d6b9c54b5ac6c1904
+  data.tar.gz: 5c0c1b7692305aeb4656df1df1ee823622d59d15
 SHA512:
-  metadata.gz: 703cf9d63b43d4e2b583b35de4964becc55c7d9f8aa61f5f23a60349e3e3883885532c6fae1533e38fcb359f71452c70d9665b26294f06ea1139e397675b1f06
-  data.tar.gz: 8e250777bf0f47a43a4d1bec135df58efc9115f93c0397e324d629e765e222a04e9e7fd0725ce4dc3ee27e4de3816f6e1aaed4d97c57fca9d5c6ebcfefdab572
+  metadata.gz: bcb9dc6a42bb089db3f4f8c3a160cfd4b02434d8d8aeda075790cf01865430bb8468b6732399b4e0e41443e2177d096123b34ac6d8572bebbbef92aca89853b1
+  data.tar.gz: 865eaf06d2049fd42a56395f66ca21a8e6cd1da09fcbe227f1226e137cb847fd8dc6118324119f35896ad0f33ed58b6e22edb7d53743998803306c79a5eacc5f

data/lib/jasmine-core/jasmine.js

@@ -2044,13 +2044,12 @@ getJasmineRequireObj().Suite = function() {
 
     var allFns = [];
 
-    if (this.isExecutable()) {
-      allFns = allFns.concat(this.beforeAllFns);
-
-      for (var i = 0; i < this.children.length; i++) {
-        allFns.push(wrapChildAsAsync(this.children[i]));
-      }
+    for (var i = 0; i < this.children.length; i++) {
+      allFns.push(wrapChildAsAsync(this.children[i]));
+    }
 
+    if (this.isExecutable()) {
+      allFns = this.beforeAllFns.concat(allFns);
       allFns = allFns.concat(this.afterAllFns);
     }
 
@@ -2906,5 +2905,5 @@ getJasmineRequireObj().interface = function(jasmine, env) {
 };
 
 getJasmineRequireObj().version = function() {
-  return '2.1.1';
+  return '2.1.2';
 };

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

@@ -186,7 +186,7 @@ describe("Suite", function() {
     expect(afterAllFn.fn).toHaveBeenCalled();
   });
 
-  it("does not run beforeAll or afterAll if there are no child specs to run", function() {
+  it("does not run beforeAll or afterAll if there are no executable child specs", function() {
     var env = new j$.Env(),
         fakeQueueRunnerForParent = jasmine.createSpy('fake parent queue runner'),
         fakeQueueRunnerForChild = jasmine.createSpy('fake child queue runner'),
@@ -209,7 +209,9 @@ describe("Suite", function() {
     parentSuite.afterAll(afterAllFn);
 
     parentSuite.execute();
-    expect(fakeQueueRunnerForParent).toHaveBeenCalledWith(jasmine.objectContaining({queueableFns: []}));
+    expect(fakeQueueRunnerForParent).toHaveBeenCalledWith(jasmine.objectContaining({
+      queueableFns: [{ fn: jasmine.any(Function) }]
+    }));
   });
 
   it("calls a provided onStart callback when starting", function() {

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

@@ -1101,8 +1101,10 @@ describe("Env integration", function() {
 
     reporter.jasmineDone.and.callFake(function() {
       expect(reporter.jasmineStarted).toHaveBeenCalledWith({
-        totalSpecsDefined: 3
+        totalSpecsDefined: 5
       });
+
+      expect(reporter.specDone.calls.count()).toBe(5);
       var suiteResult = reporter.suiteStarted.calls.argsFor(1)[0];
       expect(suiteResult.description).toEqual("A Suite");
 
@@ -1123,6 +1125,13 @@ describe("Env integration", function() {
           env.expect(true).toBe(false);
         });
       });
+
+      env.describe('with only pending specs', function() {
+        env.it('is pending');
+        env.xit('is pending', function() {
+          env.expect(true).toBe(true);
+        });
+      });
     });
 
     env.execute();

data/lib/jasmine-core/version.rb

@@ -4,6 +4,6 @@
 #
 module Jasmine
   module Core
-    VERSION = "2.1.1"
+    VERSION = "2.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine-core
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Rajan Agaskar
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-15 00:00:00.000000000 Z
+date: 2014-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake