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

Fixed objectContaining to not match when the expected is the empty object and the actual is a non-object

Browse Source
This commit is contained in:
Steve Gravrock
2019-11-02 14:22:16 -07:00
parent 71631a6529
commit 8d53f4d202
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2508,7 +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 if (typeof(other) !== 'object') { return false; }
for (var property in this.sample) { for (var property in this.sample) {
if (!hasProperty(other, property) || if (!hasProperty(other, property) ||

12
spec/core/asymmetric_equality/ObjectContainingSpec.js
View File

@@ -1,9 +1,17 @@
describe("ObjectContaining", function() { describe("ObjectContaining", function() {
it("matches any actual to an empty object", function() { it("matches any object actual to an empty object", function() {
var containing = new jasmineUnderTest.ObjectContaining({}); var containing = new jasmineUnderTest.ObjectContaining({});
expect(containing.asymmetricMatch("foo")).toBe(true); expect(containing.asymmetricMatch({foo: 1})).toBe(true);
});
it("does not match when the actual is not an object", function() {
var containing = new jasmineUnderTest.ObjectContaining({});
[1, true, undefined, "a string"].forEach(function(actual) {
expect(containing.asymmetricMatch(actual)).toBe(false);
});
}); });
it("does not match an empty object actual", function() { it("does not match an empty object actual", function() {

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

@@ -30,7 +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 if (typeof(other) !== 'object') { return false; }
for (var property in this.sample) { for (var property in this.sample) {
if (!hasProperty(other, property) || if (!hasProperty(other, property) ||