Merge branch 'fix_suite_fails' of https://github.com/timmywil/jquery …

…into timmywil-fix_suite_fails
jquery · Apr 12, 2011 · f7f4ef91cf38b3c00414d3ebdb706fc04a8e17c0 · f7f4ef9 · jfirebaugh · Apr 13, 2011
2 parents 0032e30 + 69866fd
commit f7f4ef91cf38b3c00414d3ebdb706fc04a8e17c0
Unified Split

Showing with 14 additions and 12 deletions.

+3 −0 test/data/testsuite.css

+0 −5 test/index.html

+9 −7 test/unit/attributes.js

+2 −0 test/unit/event.js
diff --git a/test/data/testsuite.css b/test/data/testsuite.css
@@ -109,3 +109,6 @@ div#show-tests * { display: none; }
 #nothiddendiv { font-size: 16px; }
 #nothiddendivchild.em { font-size: 2em; }
 #nothiddendivchild.prct { font-size: 150%; }
+
+/* For testing type on vml in IE #7071 */
+v\:oval { behavior:url(#default#VML); display:inline-block; }
diff --git a/test/index.html b/test/index.html
@@ -45,10 +45,6 @@
 	<script src="unit/effects.js"></script>
 	<script src="unit/offset.js"></script>
 	<script src="unit/dimensions.js"></script>
-
-	<!-- For testing http://bugs.jquery.com/ticket/7071 -->
-	<xml:namespace ns="urn:schemas-microsoft-com:vml" prefix="v" />
-	<style>v\:oval { behavior:url(#default#VML); display:inline-block; }</style>
 </head>
 
 <body id="body">
@@ -151,7 +147,6 @@ <h2 id="qunit-userAgent"></h2>
 			<span id="test.foo[5]bar" class="test.foo[5]bar"></span>
 
 			<foo_bar id="foobar">test element</foo_bar>
-			<v:oval id="oval" style="width:100pt;height:75pt;" fillcolor="red"> </v:oval>
 		</form>
 		<b id="floatTest">Float test.</b>
 		<iframe id="iframe" name="iframe"></iframe>

diff --git a/test/unit/attributes.js b/test/unit/attributes.js
@@ -492,6 +492,7 @@ test("val()", function() {
 var testVal = function(valueObj) {
 	expect(8);
 
+	QUnit.reset();
 	jQuery("#text1").val(valueObj( "test" ));
 	equals( document.getElementById("text1").value, "test", "Check for modified (via val(String)) value of input element" );
 
@@ -504,15 +505,16 @@ var testVal = function(valueObj) {
 	jQuery("#text1").val(valueObj( null ));
 	equals( document.getElementById("text1").value, "", "Check for modified (via val(null)) value of input element" );
 
-	jQuery("#select1").val(valueObj( "3" ));
-	equals( jQuery("#select1").val(), "3", "Check for modified (via val(String)) value of select element" );
+	var $select1 = jQuery("#select1");
+	$select1.val(valueObj( "3" ));
+	equals( $select1.val(), "3", "Check for modified (via val(String)) value of select element" );
 
-	jQuery("#select1").val(valueObj( 2 ));
-	equals( jQuery("#select1").val(), "2", "Check for modified (via val(Number)) value of select element" );
+	$select1.val(valueObj( 2 ));
+	equals( $select1.val(), "2", "Check for modified (via val(Number)) value of select element" );
 
-	jQuery("#select1").append("<option value='4'>four</option>");
-	jQuery("#select1").val(valueObj( 4 ));
-	equals( jQuery("#select1").val(), "4", "Should be possible to set the val() to a newly created option" );
+	$select1.append("<option value='4'>four</option>");
+	$select1.val(valueObj( 4 ));
+	equals( $select1.val(), "4", "Should be possible to set the val() to a newly created option" );
 
 	// using contents will get comments regular, text, and comment nodes
 	var j = jQuery("#nonnodes").contents();

diff --git a/test/unit/event.js b/test/unit/event.js
@@ -778,6 +778,8 @@ test("trigger() shortcuts", function() {
 	elem.remove();
 
 	// test that special handlers do not blow up with VML elements (#7071)
+	jQuery('<xml:namespace ns="urn:schemas-microsoft-com:vml" prefix="v" />').appendTo('head');
+	jQuery('<v:oval id="oval" style="width:100pt;height:75pt;" fillcolor="red"> </v:oval>').appendTo('#form');
 	jQuery("#oval").click().keydown();
 });