jasmine-core 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62b63c2afe6af61a81fe7a0325115f52005da3cf
-  data.tar.gz: 084d5b07313cae31f03f76e48df8c33c5318b8bd
+  metadata.gz: 6669e6ffbda26ae89717b96dd916f40d380d5bda
+  data.tar.gz: a0a3fa81cdc125d9212f5ddf2a6816ba92cd556c
 SHA512:
-  metadata.gz: ee03760e7c755b1ba5c34ea64bbe7242d6b0556f0dc341af2495ffb6bac0f0abe31f049bb30476dff678fd817c77835faa04b565dd25930a3895237de2fb78f6
-  data.tar.gz: d0b7bf5e4eb688fce121bfe4dcfe768702048668f323b6cfda045ac1457c43172344680a687128891d41ebb196715472e467e017d8c7e3a1985b3c8f0506cd30
+  metadata.gz: 5d5acc2b403f7882cab16aab3d1d022ff1a35a53b2e357e69e25b6a93461cccdcb91289f945ebd12ea298a3029bd7089a12e3b21cc40de49a173de2743d20227
+  data.tar.gz: cf5c9b6def40a3fb5c1b0f3368932f6d81e3b546d9ac8f180d96e82d48c271d6e56bc1bed30934a6745cae9006e2c1bb217000fb191fd40fd101f3a1c7cad6f6

data/lib/jasmine-core/jasmine.css

@@ -38,14 +38,7 @@ body { overflow-y: scroll; }
 .jasmine_html-reporter .bar a { color: white; }
 .jasmine_html-reporter.spec-list .bar.menu.failure-list, .jasmine_html-reporter.spec-list .results .failures { display: none; }
 .jasmine_html-reporter.failure-list .bar.menu.spec-list, .jasmine_html-reporter.failure-list .summary { display: none; }
-.jasmine_html-reporter .running-alert { background-color: #666; }
 .jasmine_html-reporter .results { margin-top: 14px; }
-.jasmine_html-reporter.showDetails .summaryMenuItem { font-weight: normal; text-decoration: inherit; }
-.jasmine_html-reporter.showDetails .summaryMenuItem:hover { text-decoration: underline; }
-.jasmine_html-reporter.showDetails .detailsMenuItem { font-weight: bold; text-decoration: underline; }
-.jasmine_html-reporter.showDetails .summary { display: none; }
-.jasmine_html-reporter.showDetails #details { display: block; }
-.jasmine_html-reporter .summaryMenuItem { font-weight: bold; text-decoration: underline; }
 .jasmine_html-reporter .summary { margin-top: 14px; }
 .jasmine_html-reporter .summary ul { list-style-type: none; margin-left: 14px; padding-top: 0; padding-left: 0; }
 .jasmine_html-reporter .summary ul.suite { margin-top: 7px; margin-bottom: 7px; }

data/lib/jasmine-core/jasmine.js

@@ -2311,30 +2311,29 @@ getJasmineRequireObj().TreeProcessor = function() {
     }
 
     function orderChildSegments(children) {
-      var result = [];
+      var specifiedOrder = [],
+          unspecifiedOrder = [];
 
       for (var i = 0; i < children.length; i++) {
         var child = children[i],
             segments = stats[child.id].segments;
 
         for (var j = 0; j < segments.length; j++) {
-          result.push(segments[j]);
-        }
-      }
-
-      result.sort(function(a, b) {
-        if (a.min === null) {
-          return b.min === null ? 0 : 1;
-        }
+          var seg = segments[j];
 
-        if (b.min === null) {
-          return -1;
+          if (seg.min === defaultMin) {
+            unspecifiedOrder.push(seg);
+          } else {
+            specifiedOrder.push(seg);
+          }
         }
+      }
 
+      specifiedOrder.sort(function(a, b) {
         return a.min - b.min;
       });
 
-      return result;
+      return specifiedOrder.concat(unspecifiedOrder);
     }
 
     function executeNode(node, segmentNumber) {
@@ -3295,5 +3294,5 @@ getJasmineRequireObj().interface = function(jasmine, env) {
 };
 
 getJasmineRequireObj().version = function() {
-  return '2.3.3';
+  return '2.3.4';
 };

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

@@ -632,4 +632,62 @@ describe("TreeProcessor", function() {
     childFns[1].fn();
     expect(leaf3.execute).toHaveBeenCalled();
   });
+
+  it("runs large segments of nodes in the order they were declared", function() {
+    var leaf1 = new Leaf(),
+        leaf2 = new Leaf(),
+        leaf3 = new Leaf(),
+        leaf4 = new Leaf(),
+        leaf5 = new Leaf(),
+        leaf6 = new Leaf(),
+        leaf7 = new Leaf(),
+        leaf8 = new Leaf(),
+        leaf9 = new Leaf(),
+        leaf10 = new Leaf(),
+        leaf11 = new Leaf(),
+        root = new Node({ children: [leaf1, leaf2, leaf3, leaf4, leaf5, leaf6, leaf7, leaf8, leaf9, leaf10, leaf11] }),
+        queueRunner = jasmine.createSpy('queueRunner'),
+        processor = new j$.TreeProcessor({
+          tree: root,
+          runnableIds: [root.id],
+          queueRunnerFactory: queueRunner
+        });
+
+    processor.execute();
+    var queueableFns = queueRunner.calls.mostRecent().args[0].queueableFns;
+    expect(queueableFns.length).toBe(11);
+
+    queueableFns[0].fn();
+    expect(leaf1.execute).toHaveBeenCalled();
+
+    queueableFns[1].fn();
+    expect(leaf2.execute).toHaveBeenCalled();
+
+    queueableFns[2].fn();
+    expect(leaf3.execute).toHaveBeenCalled();
+
+    queueableFns[3].fn();
+    expect(leaf4.execute).toHaveBeenCalled();
+
+    queueableFns[4].fn();
+    expect(leaf5.execute).toHaveBeenCalled();
+
+    queueableFns[5].fn();
+    expect(leaf6.execute).toHaveBeenCalled();
+
+    queueableFns[6].fn();
+    expect(leaf7.execute).toHaveBeenCalled();
+
+    queueableFns[7].fn();
+    expect(leaf8.execute).toHaveBeenCalled();
+
+    queueableFns[8].fn();
+    expect(leaf9.execute).toHaveBeenCalled();
+
+    queueableFns[9].fn();
+    expect(leaf10.execute).toHaveBeenCalled();
+
+    queueableFns[10].fn();
+    expect(leaf11.execute).toHaveBeenCalled();
+  });
 });

data/lib/jasmine-core/version.rb

@@ -4,6 +4,6 @@
 #
 module Jasmine
   module Core
-    VERSION = "2.3.3"
+    VERSION = "2.3.4"
   end
 end

metadata

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