From 58b8535d5d00a09660d87a6a8e1c86a478e416fc Mon Sep 17 00:00:00 2001
From: Brandon Johnson <bjohn465+github@gmail.com>
Date: Thu, 4 Apr 2013 10:14:05 -0400
Subject: Fix #12199. Handle iteration over inherited properties in oldIE.
 Close gh-1196.

---
 test/unit/core.js    | 12 +++++++++++-
 test/unit/support.js | 29 +++++++++++++++++++----------
 2 files changed, 30 insertions(+), 11 deletions(-)

(limited to 'test')

diff --git a/test/unit/core.js b/test/unit/core.js
index 072e9903f..968e674f8 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -296,7 +296,7 @@ test("type", function() {
 });
 
 asyncTest("isPlainObject", function() {
-	expect(15);
+	expect(16);
 
 	var pass, iframe, doc,
 		fn = function() {};
@@ -330,6 +330,16 @@ asyncTest("isPlainObject", function() {
 	// Again, instantiated objects shouldn't be matched
 	ok( !jQuery.isPlainObject(new fn()), "new fn" );
 
+	// Make it even harder to detect in IE < 9
+	fn = function() {
+		this.a = "a";
+	};
+	fn.prototype = {
+		b: "b"
+	};
+
+	ok( !jQuery.isPlainObject(new fn()), "fn (inherited and own properties)");
+
 	// DOM Element
 	ok( !jQuery.isPlainObject( document.createElement("div") ), "DOM Element" );
 
diff --git a/test/unit/support.js b/test/unit/support.js
index 3ee0ca65d..343f52df3 100644
--- a/test/unit/support.js
+++ b/test/unit/support.js
@@ -80,7 +80,8 @@ testIframeWithCallback( "box-sizing does not affect jQuery.support.shrinkWrapBlo
 			"reliableHiddenOffsets":true,
 			"ajax":true,
 			"cors":true,
-			"clearCloneStyle": true
+			"clearCloneStyle": true,
+			"ownLast": false
 		};
 	} else if ( /opera.*version\/12\.1/i.test( userAgent ) ) {
 		expected = {
@@ -113,7 +114,8 @@ testIframeWithCallback( "box-sizing does not affect jQuery.support.shrinkWrapBlo
 			"reliableHiddenOffsets":true,
 			"ajax":true,
 			"cors":true,
-			"clearCloneStyle": true
+			"clearCloneStyle": true,
+			"ownLast": false
 		};
 	} else if ( /msie 10\.0/i.test( userAgent ) ) {
 		expected = {
@@ -146,7 +148,8 @@ testIframeWithCallback( "box-sizing does not affect jQuery.support.shrinkWrapBlo
 			"reliableHiddenOffsets":true,
 			"ajax":true,
 			"cors":true,
-			"clearCloneStyle": false
+			"clearCloneStyle": false,
+			"ownLast": false
 		};
 	} else if ( /msie 9\.0/i.test( userAgent ) ) {
 		expected = {
@@ -179,7 +182,8 @@ testIframeWithCallback( "box-sizing does not affect jQuery.support.shrinkWrapBlo
 			"reliableHiddenOffsets":true,
 			"ajax":true,
 			"cors":false,
-			"clearCloneStyle": false
+			"clearCloneStyle": false,
+			"ownLast": false
 		};
 	} else if ( /msie 8\.0/i.test( userAgent ) ) {
 		expected = {
@@ -212,7 +216,8 @@ testIframeWithCallback( "box-sizing does not affect jQuery.support.shrinkWrapBlo
 			"reliableHiddenOffsets":false,
 			"ajax":true,
 			"cors":false,
-			"clearCloneStyle": true
+			"clearCloneStyle": true,
+			"ownLast": true
 		};
 	} else if ( /msie 7\.0/i.test( userAgent ) ) {
 		expected = {
@@ -245,7 +250,8 @@ testIframeWithCallback( "box-sizing does not affect jQuery.support.shrinkWrapBlo
 			"submitBubbles": false,
 			"tbody": false,
 			"style": false,
-			"clearCloneStyle": true
+			"clearCloneStyle": true,
+			"ownLast": true
 		};
 	} else if ( /msie 6\.0/i.test( userAgent ) ) {
 		expected = {
@@ -278,7 +284,8 @@ testIframeWithCallback( "box-sizing does not affect jQuery.support.shrinkWrapBlo
 			"reliableHiddenOffsets":false,
 			"ajax":true,
 			"cors":false,
-			"clearCloneStyle": true
+			"clearCloneStyle": true,
+			"ownLast": true
 		};
 	} else if ( /5\.1\.1 safari/i.test( userAgent ) ) {
 		expected = {
@@ -311,7 +318,8 @@ testIframeWithCallback( "box-sizing does not affect jQuery.support.shrinkWrapBlo
 			"reliableHiddenOffsets":true,
 			"ajax":true,
 			"cors":true,
-			"clearCloneStyle": true
+			"clearCloneStyle": true,
+			"ownLast": false
 		};
 	} else if ( /firefox/i.test( userAgent ) ) {
 		expected = {
@@ -344,13 +352,14 @@ testIframeWithCallback( "box-sizing does not affect jQuery.support.shrinkWrapBlo
 			"reliableHiddenOffsets":true,
 			"ajax":true,
 			"cors":true,
-			"clearCloneStyle": true
+			"clearCloneStyle": true,
+			"ownLast": false
 		};
 	}
 
 	if ( expected ) {
 		test("Verify that the support tests resolve as expected per browser", function() {
-			expect( 30 );
+			expect( 31 );
 
 			for ( var i in expected ) {
 				if ( jQuery.ajax || i !== "ajax" && i !== "cors" ) {
-- 
cgit v1.2.3