Update to jasmine-2.3.4

This is the latest patch release from the 2.3.4 series

lib/jasmine.js

@@ -343,7 +343,7 @@ getJasmineRequireObj().Spec = function(j$) {
 
     this.onStart(this);
 
-    if (!this.isExecutable() || enabled === false) {
+    if (!this.isExecutable() || this.markedPending || enabled === false) {
       complete(enabled);
       return;
     }
@@ -420,7 +420,7 @@ getJasmineRequireObj().Spec = function(j$) {
   };
 
   Spec.prototype.isExecutable = function() {
-    return !this.disabled && !this.markedPending;
+    return !this.disabled;
   };
 
   Spec.prototype.getFullName = function() {
@@ -695,6 +695,12 @@ getJasmineRequireObj().Env = function(j$) {
     };
 
     var suiteFactory = function(description) {
+      function suiteStarted(suite) {
+        currentlyExecutingSuites.push(suite);
+        defaultResourcesForRunnable(suite.id, suite.parentSuite.id);
+        reporter.suiteStarted(suite.result);
+      }
+
       var suite = new j$.Suite({
         env: self,
         id: getNextSuiteId(),
@@ -2209,6 +2215,7 @@ getJasmineRequireObj().TreeProcessor = function() {
 
       queueRunnerFactory({
         queueableFns: childFns,
+        userContext: tree.sharedUserContext(),
         onException: function() {
           tree.onException.apply(tree, arguments);
         },
@@ -2311,30 +2318,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]);
-        }
-      }
+          var seg = segments[j];
 
-      result.sort(function(a, b) {
-        if (a.min === null) {
-          return b.min === null ? 0 : 1;
-        }
-
-        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 +3301,5 @@ getJasmineRequireObj().interface = function(jasmine, env) {
 };
 
 getJasmineRequireObj().version = function() {
-  return '2.3.0';
+  return '2.3.4';
 };

lib/update-jasmine.sh

@@ -1,5 +1,5 @@
 # This script is used to build our custom version of the Jasmine library by
 # downloading the upstream file and applying our patches, and is meant for use
 # only when upgrading to a new upstream version.
-curl -o jasmine.js https://raw.githubusercontent.com/jasmine/jasmine/v2.3.0/lib/jasmine-core/jasmine.js
+curl -o jasmine.js https://raw.githubusercontent.com/jasmine/jasmine/v2.3.4/lib/jasmine-core/jasmine.js
 patch <local-modifications.patch jasmine.js

meson.build

@@ -1,4 +1,4 @@
-project('jasmine-gjs', version: '2.3.0', license: 'MIT',
+project('jasmine-gjs', version: '2.3.4', license: 'MIT',
     meson_version: '>= 0.50.0')
 
 gjs_dep = dependency('gjs-1.0', required: false)