diff --git a/README.md b/README.md index f26bb82c..f900383e 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ Jasmine tests itself across many browsers (Safari, Chrome, Firefox, Microsoft Ed | Node | 10, 12, 14, 16 | | Safari | 8-14 | | Chrome | Evergreen | -| Firefox | Evergreen, 68, 78 | +| Firefox | Evergreen, 68, 78, 91 | | Edge | Evergreen | | Internet Explorer | 10, 11 | diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index 22d7b96a..9f0da7e2 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -1036,7 +1036,7 @@ x */ if (this.message) { this.excludeMessage = message; } - this.pend(); + this.pend(message); }; Spec.prototype.getResult = function() { 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 fed12b02..45d74aaa 100755 --- a/scripts/run-all-browsers +++ b/scripts/run-all-browsers @@ -27,6 +27,7 @@ run_browser "internet explorer" 11 run_browser "internet explorer" 10 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/EnvSpec.js b/spec/core/EnvSpec.js index ced422a4..5087d185 100644 --- a/spec/core/EnvSpec.js +++ b/spec/core/EnvSpec.js @@ -538,6 +538,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/Spec.js b/src/core/Spec.js index 1639a918..ffaaff75 100644 --- a/src/core/Spec.js +++ b/src/core/Spec.js @@ -254,7 +254,7 @@ x */ if (this.message) { this.excludeMessage = message; } - this.pend(); + this.pend(message); }; Spec.prototype.getResult = function() {