github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-04-20 03:01:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core: Restore 1.x isPlainObject constructor checks

Browse Source 
- Guard isPlainObject against inherited scalar constructors

Fixes gh-2982
Close gh-2985
This commit is contained in:
Richard Gibson
2016-03-11 10:48:00 -05:00
committed by Timmy Willison
parent 0f5f0c981a
commit 0c1f72667d
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/unit/core.js
View File

@@ -286,7 +286,8 @@ QUnit.test( "type for `Symbol`", function( assert ) {
});
QUnit.asyncTest( "isPlainObject", function( assert ) {
assert.expect( 19 );
assert.expect( 22 );
var pass, iframe, doc, parentObj, childObj, deep,
fn = function() {};
@@ -294,6 +295,10 @@ QUnit.asyncTest( "isPlainObject", function( assert ) {
// The use case that we want to match
assert.ok( jQuery.isPlainObject( {} ), "{}" );
assert.ok( jQuery.isPlainObject( new window.Object() ), "new Object" );
assert.ok( jQuery.isPlainObject( { constructor: fn } ),
"plain object with constructor property" );
assert.ok( jQuery.isPlainObject( { constructor: "foo" } ),
"plain object with primitive constructor property" );
parentObj = { foo: "bar" };
childObj = Object.create( parentObj );
@@ -328,6 +333,10 @@ QUnit.asyncTest( "isPlainObject", function( assert ) {
// Again, instantiated objects shouldn't be matched
assert.ok( !jQuery.isPlainObject( new fn() ), "new fn" );
// Instantiated objects with primitive constructors shouldn't be matched
fn.prototype.constructor = "foo";
assert.ok( !jQuery.isPlainObject( new fn() ), "new fn with primitive constructor" );
// Deep object
deep = { "foo": { "baz": true }, "foo2": document };
assert.ok( jQuery.isPlainObject( deep ), "Object with objects is still plain" );