admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed comparison between ObjectContaining and non-objects on IE

Browse Source
This commit is contained in:
Steve Gravrock
2019-09-28 18:39:43 -07:00
parent 472f61ab37
commit ef3f127d27
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/jasmine-core/jasmine.js
View File

@@ -2495,7 +2495,7 @@ getJasmineRequireObj().ObjectContaining = function(j$) {
} }
function hasProperty(obj, property) { function hasProperty(obj, property) {
if (!obj) { if (!obj || typeof(obj) !== 'object') {
return false; return false;
} }
@@ -2508,6 +2508,7 @@ getJasmineRequireObj().ObjectContaining = function(j$) {
ObjectContaining.prototype.asymmetricMatch = function(other, customTesters) { ObjectContaining.prototype.asymmetricMatch = function(other, customTesters) {
if (typeof(this.sample) !== 'object') { throw new Error('You must provide an object to objectContaining, not \''+this.sample+'\'.'); } if (typeof(this.sample) !== 'object') { throw new Error('You must provide an object to objectContaining, not \''+this.sample+'\'.'); }
// TODO: This succeeds when sample is an empty object and other is a non-object, but should probably fail
for (var property in this.sample) { for (var property in this.sample) {
if (!hasProperty(other, property) || if (!hasProperty(other, property) ||

3
src/core/asymmetric_equality/ObjectContaining.js
View File

@@ -17,7 +17,7 @@ getJasmineRequireObj().ObjectContaining = function(j$) {
} }
function hasProperty(obj, property) { function hasProperty(obj, property) {
if (!obj) { if (!obj || typeof(obj) !== 'object') {
return false; return false;
} }
@@ -30,6 +30,7 @@ getJasmineRequireObj().ObjectContaining = function(j$) {
ObjectContaining.prototype.asymmetricMatch = function(other, customTesters) { ObjectContaining.prototype.asymmetricMatch = function(other, customTesters) {
if (typeof(this.sample) !== 'object') { throw new Error('You must provide an object to objectContaining, not \''+this.sample+'\'.'); } if (typeof(this.sample) !== 'object') { throw new Error('You must provide an object to objectContaining, not \''+this.sample+'\'.'); }
// TODO: This succeeds when sample is an empty object and other is a non-object, but should probably fail
for (var property in this.sample) { for (var property in this.sample) {
if (!hasProperty(other, property) || if (!hasProperty(other, property) ||