Merge branch '3.99' into 4.0

README.md

@@ -51,7 +51,7 @@ Jasmine tests itself across many browsers (Safari, Chrome, Firefox, Microsoft Ed
 | Node              | 12.17+, 14, 16     |
 | Safari            | 13-14              |
 | Chrome            | Evergreen          |
-| Firefox           | Evergreen, 68, 78  |
+| Firefox           | Evergreen, 68, 78, 91 |
 | Edge              | Evergreen          |
 
 For evergreen browsers, each version of Jasmine is tested against the version of the browser that is available to us

lib/jasmine-core/jasmine.js

@@ -991,7 +991,7 @@ getJasmineRequireObj().Spec = function(j$) {
     if (this.message) {
       this.excludeMessage = message;
     }
-    this.pend();
+    this.pend(message);
   };
 
   Spec.prototype.getResult = function() {
@@ -3712,8 +3712,8 @@ getJasmineRequireObj().Deprecator = function(j$) {
   }
 
   var verboseNote =
-    'Note: This message will be shown only once. ' +
+    'Note: This message will be shown only once. Set the verboseDeprecations ' +
-    'Set config.verboseDeprecations to true to see every occurrence.';
+    'config property to true to see every occurrence.';
 
   Deprecator.prototype.verboseDeprecations = function(enabled) {
     this.verbose_ = enabled;

release_notes/3.10.1.md

@@ -0,0 +1,12 @@
+# Jasmine Core 3.10.1 Release Notes
+
+## Bugfixes
+
+* Fixed missing pendingReason in pending spec results
+  * Fixes [#1939](https://github.com/jasmine/jasmine/issues/1939)
+  * Merges [#1940](https://github.com/jasmine/jasmine/pull/1940) from @jan-molak
+
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

scripts/run-all-browsers

@@ -25,6 +25,7 @@ passfile=`mktemp -t jasmine-results.XXXXXX` || exit 1
 failfile=`mktemp -t jasmine-results.XXXXXX` || exit 1
 run_browser chrome latest
 run_browser firefox latest
+run_browser firefox 91
 run_browser firefox 78
 run_browser firefox 68
 run_browser safari 14

spec/core/DeprecatorSpec.js

@@ -288,8 +288,8 @@ describe('Deprecator', function() {
 
     function verboseDeprecationsNote() {
       return (
-        'Note: This message will be shown only once. Set ' +
+        'Note: This message will be shown only once. Set the ' +
-        'config.verboseDeprecations to true to see every occurrence.'
+        'verboseDeprecations config property to true to see every occurrence.'
       );
     }
 

spec/core/EnvSpec.js

@@ -315,6 +315,18 @@ describe('Env', function() {
       expect(excludeSpy).toHaveBeenCalledWith('Temporarily disabled with xit');
     });
 
+    it('calls spec.pend with "Temporarily disabled with xit"', function() {
+      var pendSpy = jasmine.createSpy();
+      var realExclude = jasmineUnderTest.Spec.prototype.exclude;
+
+      spyOn(env, 'it_').and.returnValue({
+        exclude: realExclude,
+        pend: pendSpy
+      });
+      env.xit('foo', function() {});
+      expect(pendSpy).toHaveBeenCalledWith('Temporarily disabled with xit');
+    });
+
     it('throws an error when it receives a non-fn argument', function() {
       expect(function() {
         env.xit('undefined arg', null);

src/core/Deprecator.js

@@ -6,8 +6,8 @@ getJasmineRequireObj().Deprecator = function(j$) {
   }
 
   var verboseNote =
-    'Note: This message will be shown only once. ' +
+    'Note: This message will be shown only once. Set the verboseDeprecations ' +
-    'Set config.verboseDeprecations to true to see every occurrence.';
+    'config property to true to see every occurrence.';
 
   Deprecator.prototype.verboseDeprecations = function(enabled) {
     this.verbose_ = enabled;

src/core/Spec.js

@@ -258,7 +258,7 @@ getJasmineRequireObj().Spec = function(j$) {
     if (this.message) {
       this.excludeMessage = message;
     }
-    this.pend();
+    this.pend(message);
   };
 
   Spec.prototype.getResult = function() {