]> source.dussan.org Git - jquery.git/commitdiff
projects / jquery.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6d49e84)
VML.type test was causing multiple test suite fails, fix attributes.js fail in IE6... 323/head
authortimmywil <tim.willison@thisismedium.com>
Tue, 12 Apr 2011 23:32:18 +0000 (19:32 -0400)
committertimmywil <tim.willison@thisismedium.com>
Tue, 12 Apr 2011 23:32:18 +0000 (19:32 -0400)
test/data/testsuite.css patch | blob | history
test/index.html patch | blob | history
test/unit/attributes.js patch | blob | history
test/unit/event.js patch | blob | history

diff --git a/test/data/testsuite.css b/test/data/testsuite.css
index 02900681059a93ab1b7cd3f9eae8a9fb0d6c36a1..a9dd97ba45e4c84cba0db62eaf178c8978b787a5 100644 (file)
--- 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; }
\ No newline at end of file
diff --git a/test/index.html b/test/index.html
index bf7dc7989ef2c7d0952444c9b92acdbd530a3808..a106550898d860127d66ba585599370066e4f37e 100644 (file)
--- 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 @@
                        <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
index c78a2961f99de869363919a3e92a40705e81dbfc..2bcc5046ea97b6257e0a5a64463d7d887ed77b3e 100644 (file)
--- 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
index 491396f93ccbd49c6bc03231cfd1548a740474c5..8ffbcd5b2ae483f8462ffa75fe73844aa011e86d 100644 (file)
--- 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();
 });
 
jQuery JavaScript Library: https://github.com/jquery/jquery