Added a fix for .noConflict(true) not reverting properly. Also added unit tests for...

[jquery.git] / test / unit / core.js

diff --git a/test/unit/core.js b/test/unit/core.js
index 32ff83e..5101f81 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -38,6 +38,27 @@ test("$()", function() {
        equals( div.length, 4, "Correct number of elements generated for div hr code b" );
 });
 
+test("noConflict", function() {
+       expect(6);
+       
+       var old = jQuery;
+       var newjQuery = jQuery.noConflict();
+
+       ok( newjQuery == old, "noConflict returned the jQuery object" );
+       ok( jQuery == old, "Make sure jQuery wasn't touched." );
+       ok( $ == "$", "Make sure $ was reverted." );
+
+       jQuery = $ = old;
+
+       newjQuery = jQuery.noConflict(true);
+
+       ok( newjQuery == old, "noConflict returned the jQuery object" );
+       ok( jQuery == "jQuery", "Make sure jQuery was reverted." );
+       ok( $ == "$", "Make sure $ was reverted." );
+
+       jQuery = $ = old;
+});
+
 test("isFunction", function() {
        expect(21);
 
@@ -778,7 +799,7 @@ test("is(String)", function() {
 });
 
 test("$.extend(Object, Object)", function() {
-       expect(10);
+       expect(11);
 
        var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
                options =     { xnumber2: 1, xstring2: "x", xxx: "newstring" },
@@ -786,9 +807,9 @@ test("$.extend(Object, Object)", function() {
                merged = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "x", xxx: "newstring" },
                deep1 = { foo: { bar: true } },
                deep1copy = { foo: { bar: true } },
-               deep2 = { foo: { baz: true } },
-               deep2copy = { foo: { baz: true } },
-               deepmerged = { foo: { bar: true, baz: true } };
+               deep2 = { foo: { baz: true }, foo2: document },
+               deep2copy = { foo: { baz: true }, foo2: document },
+               deepmerged = { foo: { bar: true, baz: true }, foo2: document };
 
        jQuery.extend(settings, options);
        isObj( settings, merged, "Check if extended: settings must be extended" );
@@ -801,6 +822,7 @@ test("$.extend(Object, Object)", function() {
        jQuery.extend(true, deep1, deep2);
        isObj( deep1.foo, deepmerged.foo, "Check if foo: settings must be extended" );
        isObj( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" );
+       equals( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" );
 
        var defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
                defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
@@ -824,15 +846,20 @@ test("val()", function() {
 });
 
 test("val(String)", function() {
-       expect(2);
+       expect(3);
        document.getElementById('text1').value = "bla";
        ok( $("#text1").val() == "bla", "Check for modified value of input element" );
        $("#text1").val('test');
        ok ( document.getElementById('text1').value == "test", "Check for modified (via val(String)) value of input element" );
+       
+       $("#select1").val("3");
+       ok( $("#select1").val() == "3", "Check for modified (via val(String)) value of select element" );
 });
 
+var scriptorder = 0;
+
 test("html(String)", function() {
-       expect(3);
+       expect(9);
        var div = $("div");
        div.html("<b>test</b>");
        var pass = true;
@@ -847,6 +874,8 @@ test("html(String)", function() {
 
        $("#main").html('foo <form><script type="text/javascript">ok( true, "$().html().evalScripts() Evals Scripts Twice in Firefox, see #975" );</script></form>');
 
+       $("#main").html("<script>ok(scriptorder++ == 0, 'Script is executed in order');ok($('#scriptorder').length == 0,'Execute before html')<\/script><span id='scriptorder'><script>ok(scriptorder++ == 1, 'Script is executed in order');ok($('#scriptorder').length == 1,'Execute after html')<\/script></span><script>ok(scriptorder++ == 2, 'Script is executed in order');ok($('#scriptorder').length == 1,'Execute after html')<\/script>");
+
        setTimeout( start, 100 );
 });