diff --git a/README.md b/README.md index ffad57c6..37b5c9c5 100644 --- a/README.md +++ b/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 diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index eefa05e0..d93e08c1 100644 --- a/lib/jasmine-core/jasmine.js +++ b/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. ' + - 'Set config.verboseDeprecations to true to see every occurrence.'; + 'Note: This message will be shown only once. Set the verboseDeprecations ' + + 'config property to true to see every occurrence.'; Deprecator.prototype.verboseDeprecations = function(enabled) { this.verbose_ = enabled; diff --git a/release_notes/3.10.1.md b/release_notes/3.10.1.md new file mode 100644 index 00000000..f3f44228 --- /dev/null +++ b/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)_ diff --git a/scripts/run-all-browsers b/scripts/run-all-browsers index a240ab3a..9443b777 100755 --- a/scripts/run-all-browsers +++ b/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 diff --git a/spec/core/DeprecatorSpec.js b/spec/core/DeprecatorSpec.js index 8e4bbe75..bfd1761c 100644 --- a/spec/core/DeprecatorSpec.js +++ b/spec/core/DeprecatorSpec.js @@ -288,8 +288,8 @@ describe('Deprecator', function() { function verboseDeprecationsNote() { return ( - 'Note: This message will be shown only once. Set ' + - 'config.verboseDeprecations to true to see every occurrence.' + 'Note: This message will be shown only once. Set the ' + + 'verboseDeprecations config property to true to see every occurrence.' ); } diff --git a/spec/core/EnvSpec.js b/spec/core/EnvSpec.js index f8d4072c..e51c3c20 100644 --- a/spec/core/EnvSpec.js +++ b/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); diff --git a/src/core/Deprecator.js b/src/core/Deprecator.js index 3e63c9d3..00dcf15a 100644 --- a/src/core/Deprecator.js +++ b/src/core/Deprecator.js @@ -6,8 +6,8 @@ getJasmineRequireObj().Deprecator = function(j$) { } var verboseNote = - 'Note: This message will be shown only once. ' + - 'Set config.verboseDeprecations to true to see every occurrence.'; + 'Note: This message will be shown only once. Set the verboseDeprecations ' + + 'config property to true to see every occurrence.'; Deprecator.prototype.verboseDeprecations = function(enabled) { this.verbose_ = enabled; diff --git a/src/core/Spec.js b/src/core/Spec.js index 9b35f749..e0a86dd8 100644 --- a/src/core/Spec.js +++ b/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() {