From: Corey Frang <gnarf@gnarf.net>
Date: Thu, 14 Jul 2011 03:54:25 +0000 (-0500)
Subject: Unit test for #6652
X-Git-Tag: 1.6.3rc1~30^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F416%2Fhead;p=jquery.git

Unit test for #6652
---

diff --git a/test/data/testsuite.css b/test/data/testsuite.css
index 295740f5c..8c88a9334 100644
--- a/test/data/testsuite.css
+++ b/test/data/testsuite.css
@@ -121,3 +121,5 @@ dfn { display: none; }
 /* #9239 Attach a background to the body( avoid crashes in removing the test element in support ) */
 body, div { background: url(http://static.jquery.com/files/rocker/images/logo_jquery_215x53.gif) no-repeat -1000px 0; }
 
+/* #6652 REMOVE FILTER:ALPHA(OPACITY=100) AFTER ANIMATION */
+#t6652 div { filter: alpha(opacity=50); }
diff --git a/test/index.html b/test/index.html
index 4b4c98552..93d2209d0 100644
--- a/test/index.html
+++ b/test/index.html
@@ -226,6 +226,9 @@ Z</textarea>
 			<div id="t2037">
 				<div><div class="hidden">hidden</div></div>
 			</div>
+			<div id="t6652">
+				<div></div>
+			</div>
 		</div>
 
 		<div id="tabindex-tests">
diff --git a/test/unit/css.js b/test/unit/css.js
index f421f7bd4..c01acdd68 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -259,6 +259,23 @@ if ( !jQuery.support.opacity ) {
 		jQuery("#foo").css("filter", filterVal3).css("opacity", 1);
 		ok( jQuery("#foo").css("filter").indexOf(filterVal3) !== -1, "Setting opacity in IE doesn't clobber other filters" );
 	});
+
+	test( "Setting opacity to 1 properly removes filter: style (#6652)", function() {
+		var rfilter = /filter:[^;]*/i,
+			test = jQuery( "#t6652" ).css( "opacity", 1 ),
+			test2 = test.find( "div" ).css( "opacity", 1 );
+
+		function hasFilter( elem ) {
+			var match = rfilter.exec( elem[0].style.cssText );
+			if ( match ) {
+				return true;
+			}
+			return false;
+		}
+		expect( 2 );
+		ok( !hasFilter( test ), "Removed filter attribute on element without filter in stylesheet" );
+		ok( hasFilter( test2 ), "Filter attribute remains on element that had filter in stylesheet" );
+	});
 }
 
 test("css(String, Function)", function() {