diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index 303e567e..2eff6cba 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -233,9 +233,15 @@ getJasmineRequireObj().base = function(j$, jasmineGlobal) { if (value instanceof Error) { return true; } - if (value && value.constructor && value.constructor.constructor && - (value instanceof (value.constructor.constructor('return this')()).Error)) { - return true; + if (value && value.constructor && value.constructor.constructor) { + var valueGlobal = value.constructor.constructor('return this'); + if (j$.isFunction_(valueGlobal)) { + valueGlobal = valueGlobal(); + } + + if (valueGlobal.Error && value instanceof valueGlobal.Error) { + return true; + } } return false; }; @@ -7023,5 +7029,5 @@ getJasmineRequireObj().UserContext = function(j$) { }; getJasmineRequireObj().version = function() { - return '3.3.0'; + return '3.4.0'; }; diff --git a/lib/jasmine-core/version.rb b/lib/jasmine-core/version.rb index 3f8f2931..0310ebe7 100644 --- a/lib/jasmine-core/version.rb +++ b/lib/jasmine-core/version.rb @@ -4,6 +4,6 @@ # module Jasmine module Core - VERSION = "3.3.0" + VERSION = "3.4.0" end end diff --git a/package.json b/package.json index 029398ea..aacca8ae 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "jasmine-core", "license": "MIT", - "version": "3.3.0", + "version": "3.4.0", "repository": { "type": "git", "url": "https://github.com/jasmine/jasmine.git" diff --git a/release_notes/3.4.0.md b/release_notes/3.4.0.md new file mode 100644 index 00000000..e252ecc1 --- /dev/null +++ b/release_notes/3.4.0.md @@ -0,0 +1,49 @@ +# Jasmine Core 3.4 Release Notes + +## Summary + +This is a maintenance release of Jasmine with a number of new features and fixes + +## Changes + +* Handle WebSocket events in IE when detecting Errors + - Fixes [#1623](https://github.com/jasmine/jasmine-npm/issues/1623) + +* bump dependencies for security fixes + - Merges [#1672](https://github.com/jasmine/jasmine-npm/issues/1672) from @wood1986 + +* Make node execution default and override for browsers + - Merges [#1658](https://github.com/jasmine/jasmine-npm/issues/1658) from @wood1986 + - Fixes [#883](https://github.com/jasmine/jasmine-npm/issues/883) + +* feat(result.duration): report test duration in ms + - Merges [#1660](https://github.com/jasmine/jasmine-npm/issues/1660) from @johnjbarton + - Fixes [#1646](https://github.com/jasmine/jasmine-npm/issues/1646) + +* refactor(Timer): share htmlReporter noopTimer via Timer.js + - Merges [#1669](https://github.com/jasmine/jasmine-npm/issues/1669) from @johnjbarton + +* Fix various typos + - Merges [#1666](https://github.com/jasmine/jasmine-npm/issues/1666) from @FelixRilling + - Merges [#1667](https://github.com/jasmine/jasmine-npm/issues/1667) from @FelixRilling + - Merges [#1665](https://github.com/jasmine/jasmine-npm/issues/1665) from @FelixRilling + - Merges [#1664](https://github.com/jasmine/jasmine-npm/issues/1664) from @FelixRilling + - Fixes [#1663](https://github.com/jasmine/jasmine-npm/issues/1663) + +* When catching a global error in Node.js, print the type of error + - Merges [#1632](https://github.com/jasmine/jasmine-npm/issues/1632) from @jbunton-atlassian + +* Support Error.stack in globalErrors. + - Merges [#1644](https://github.com/jasmine/jasmine-npm/issues/1644) from @johnjbarton + +* Stop treating objects with a `nodeType` as if they are DOM Nodes + - Fixes [#1638](https://github.com/jasmine/jasmine-npm/issues/1638) + +* Fixes issue where PhantomJS 2 and IE 10 - 11 crashed when reporting SVG element equality + - Merges [#1621](https://github.com/jasmine/jasmine-npm/issues/1621) from @Havunen + - Fixes [#1618](https://github.com/jasmine/jasmine-npm/issues/1618) + + +------ + +_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_