Update to jasmine-2.3.4

debian/changelog

@@ -1,3 +1,9 @@
+jasmine-gjs (2.3.4-1) unstable; urgency=low
+
+  * Upgrade to 2.3.4
+
+ -- Andy Holmes <[email protected]>  Wed, 26 Aug 2020 16:34:43 -0700
+
 jasmine-gjs (2.3.0-1) unstable; urgency=low
 
   * Upgrade to 2.3.0

jasmine-gjs.spec

@@ -1,11 +1,11 @@
 Name: jasmine-gjs
-Version: 2.3.0
+Version: 2.3.4
 Release: 1%{?dist}
 Summary: A behavior-driven development framework for GJS
 
 License: MIT
 URL: https://github.com/ptomato/jasmine-gjs
-Source0: http://ptomato.name/downloads/jasmine-gjs-2.3.0.tar.xz
+Source0: http://ptomato.name/downloads/jasmine-gjs-2.3.4.tar.xz
 
 BuildArch: noarch
 BuildRequires: gjs >= 1.58.0
@@ -46,6 +46,8 @@ be displayed in your terminal.
 
 
 %changelog
+* Mon Aug 26 2020 Andy Holmes <[email protected]> - 2.3.4-1
+- Update to version 2.3.4.
 * Mon Aug 24 2020 Philip Chimento <[email protected]> - 2.3.0-1
 - Update to version 2.3.0.
 * Tue Jun 30 2015 Philip Chimento <[email protected]> - 2.2.1-1

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() {
@@ -2209,6 +2209,7 @@ getJasmineRequireObj().TreeProcessor = function() {
 
       queueRunnerFactory({
         queueableFns: childFns,
+        userContext: tree.sharedUserContext(),
         onException: function() {
           tree.onException.apply(tree, arguments);
         },
@@ -2311,30 +2312,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 +3295,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)