From 2c440b8e443164d517241d6757038324ae590f09 Mon Sep 17 00:00:00 2001 From: Jan Molak <1089173+jan-molak@users.noreply.github.com> Date: Fri, 22 Oct 2021 17:58:31 +0100 Subject: [PATCH 1/6] Fixed result.pendingReason for specs marked with xit. Closes #1939 --- lib/jasmine-core/jasmine.js | 2 +- spec/core/EnvSpec.js | 12 ++++++++++++ src/core/Spec.js | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index 86d7ba37..daad6630 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -991,7 +991,7 @@ x */ if (this.message) { this.excludeMessage = message; } - this.pend(); + this.pend(message); }; Spec.prototype.getResult = function() { diff --git a/spec/core/EnvSpec.js b/spec/core/EnvSpec.js index ffc39aa0..49e7f7e8 100644 --- a/spec/core/EnvSpec.js +++ b/spec/core/EnvSpec.js @@ -274,6 +274,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 1548583a..2241085c 100644 --- a/src/core/Spec.js +++ b/src/core/Spec.js @@ -236,7 +236,7 @@ x */ if (this.message) { this.excludeMessage = message; } - this.pend(); + this.pend(message); }; Spec.prototype.getResult = function() { From 504ef278990d815b2553d865b44542bc209a8d41 Mon Sep 17 00:00:00 2001 From: Jan Molak <1089173+jan-molak@users.noreply.github.com> Date: Fri, 22 Oct 2021 17:58:31 +0100 Subject: [PATCH 2/6] Fixed result.pendingReason for specs marked with xit. Closes #1939 --- lib/jasmine-core/jasmine.js | 2 +- spec/core/EnvSpec.js | 12 ++++++++++++ src/core/Spec.js | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index 86d7ba37..daad6630 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -991,7 +991,7 @@ x */ if (this.message) { this.excludeMessage = message; } - this.pend(); + this.pend(message); }; Spec.prototype.getResult = function() { diff --git a/spec/core/EnvSpec.js b/spec/core/EnvSpec.js index ffc39aa0..49e7f7e8 100644 --- a/spec/core/EnvSpec.js +++ b/spec/core/EnvSpec.js @@ -274,6 +274,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 1548583a..2241085c 100644 --- a/src/core/Spec.js +++ b/src/core/Spec.js @@ -236,7 +236,7 @@ x */ if (this.message) { this.excludeMessage = message; } - this.pend(); + this.pend(message); }; Spec.prototype.getResult = function() { From e86a7f00a679987aff24ce72996aee72ccd5406e Mon Sep 17 00:00:00 2001 From: Steve Gravrock Date: Fri, 22 Oct 2021 16:07:23 -0700 Subject: [PATCH 3/6] Bump version to 3.10.1 --- lib/jasmine-core/jasmine.js | 2 +- lib/jasmine-core/version.rb | 2 +- package.json | 2 +- release_notes/3.10.1.md | 12 ++++++++++++ 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 release_notes/3.10.1.md diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index daad6630..2ce7c15f 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -10111,5 +10111,5 @@ getJasmineRequireObj().UserContext = function(j$) { }; getJasmineRequireObj().version = function() { - return '3.10.0'; + return '3.10.1'; }; diff --git a/lib/jasmine-core/version.rb b/lib/jasmine-core/version.rb index 8d69fe3f..9ec2c1f9 100644 --- a/lib/jasmine-core/version.rb +++ b/lib/jasmine-core/version.rb @@ -4,6 +4,6 @@ # module Jasmine module Core - VERSION = "3.10.0" + VERSION = "3.10.1" end end diff --git a/package.json b/package.json index c81c63eb..6e29e331 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "jasmine-core", "license": "MIT", - "version": "3.10.0", + "version": "3.10.1", "repository": { "type": "git", "url": "https://github.com/jasmine/jasmine.git" 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)_ From c48fb0b0e740475ca441dced7b7fb5460b384ca6 Mon Sep 17 00:00:00 2001 From: Steve Gravrock Date: Sun, 14 Nov 2021 14:18:06 -0800 Subject: [PATCH 4/6] Added Firefox 91 (current ESR) to CI matrix --- README.md | 2 +- scripts/run-all-browsers | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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/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 From 439be97c341876d245142582314174fb9697b45b Mon Sep 17 00:00:00 2001 From: Steve Gravrock Date: Wed, 24 Nov 2021 11:45:32 -0800 Subject: [PATCH 5/6] Rephrased note about verboseDeprecations --- lib/jasmine-core/jasmine.js | 4 ++-- spec/core/DeprecatorSpec.js | 4 ++-- spec/core/integration/EnvSpec.js | 5 +++-- src/core/Deprecator.js | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index 2631ec8b..22d7b96a 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -4261,8 +4261,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/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/integration/EnvSpec.js b/spec/core/integration/EnvSpec.js index 556dc029..94fd98ba 100644 --- a/spec/core/integration/EnvSpec.js +++ b/spec/core/integration/EnvSpec.js @@ -645,8 +645,9 @@ describe('Env integration', function() { "An asynchronous reporter callback called its 'done' callback more " + 'than once. This is a bug in the reporter callback in question. This ' + 'will be treated as an error in a future version.\nNote: This message ' + - 'will be shown only once. Set config.verboseDeprecations to true to ' + - 'see every occurrence.'; + 'will be shown only once. Set the verboseDeprecations config property ' + + 'to true to see every occurrence.'; + var reporter = jasmine.createSpyObj('fakeReport', ['jasmineDone']); reporter.specDone = function(result, done) { done(); 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; From 8804ddb8cf8cb0176adf5657084f3bf66fb80db9 Mon Sep 17 00:00:00 2001 From: Steve Gravrock Date: Wed, 24 Nov 2021 15:38:40 -0800 Subject: [PATCH 6/6] Updated boot file lists for the Ruby gem and Python egg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This prevents consumers that rely on those lists (especially the Jasmine gem and egg) from getting a deprecation warning about boot.js. --- lib/jasmine-core.rb | 2 +- lib/jasmine-core/core.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/jasmine-core.rb b/lib/jasmine-core.rb index 6ba57dd8..55a03fba 100644 --- a/lib/jasmine-core.rb +++ b/lib/jasmine-core.rb @@ -49,7 +49,7 @@ module Jasmine end def boot_files - ["boot.js"] + ["boot0.js", "boot1.js"] end def node_boot_files diff --git a/lib/jasmine-core/core.py b/lib/jasmine-core/core.py index 936e9b0f..51ef0b30 100644 --- a/lib/jasmine-core/core.py +++ b/lib/jasmine-core/core.py @@ -54,14 +54,14 @@ class Core(object): # jasmine.js needs to be first js_files.insert(0, 'jasmine.js') - # boot needs to be last + # Remove the legacy boot file js_files.remove('boot.js') - js_files.append('boot.js') - # Remove the new boot files. jasmine-py will continue to use the legacy - # boot.js. + # boot files need to be last js_files.remove('boot0.js') js_files.remove('boot1.js') + js_files.append('boot0.js') + js_files.append('boot1.js') return cls._uniq(js_files)