X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=18f1bb54d798647cc95728f120d4d0737264707d;hb=264ffbc73be61778484a292392d1b18a8976588f;hp=f5fc895a4e3e7bbf5ea0ef29002b80946a6a763a;hpb=14b88f6019cd467c35a2c9e845740a61c153525e;p=jquery.git
diff --git a/test/unit/core.js b/test/unit/core.js
index f5fc895..18f1bb5 100644
--- 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);
@@ -368,6 +389,18 @@ test("css(String, Object)", function() {
ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" );
});
+test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", function () {
+ expect(4);
+
+ var $checkedtest = $("#checkedtest");
+ // IE6 was clearing "checked" in jQuery.css(elem, "height");
+ jQuery.css($checkedtest[0], "height");
+ ok( !! $(":radio:first", $checkedtest).attr("checked"), "Check first radio still checked." );
+ ok( ! $(":radio:last", $checkedtest).attr("checked"), "Check last radio still NOT checked." );
+ ok( !! $(":checkbox:first", $checkedtest).attr("checked"), "Check first checkbox still checked." );
+ ok( ! $(":checkbox:last", $checkedtest).attr("checked"), "Check last checkbox still NOT checked." );
+});
+
test("text()", function() {
expect(1);
var expected = "This link has class=\"blog\": Simon Willison's Weblog";
@@ -778,7 +811,7 @@ test("is(String)", function() {
});
test("$.extend(Object, Object)", function() {
- expect(11);
+ expect(14);
var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
options = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
@@ -803,6 +836,17 @@ test("$.extend(Object, Object)", function() {
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 target = {};
+ var recursive = { foo:target, bar:5 };
+ jQuery.extend(true, target, recursive);
+ isObj( target, { bar:5 }, "Check to make sure a recursive obj doesn't go never-ending loop by not copying it over" );
+
+ var ret = jQuery.extend(true, { foo: [] }, { foo: [0] } ); // 1907
+ ok( ret.foo.length == 1, "Check to make sure a value with coersion 'false' copies over when necessary to fix #1907" );
+
+ var ret = jQuery.extend(true, { foo: "1,2,3" }, { foo: [1, 2, 3] } );
+ ok( typeof ret.foo != "string", "Check to make sure values equal with coersion (but not actually equal) overwrite correctly" );
+
var defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
options1 = { xnumber2: 1, xstring2: "x" },
@@ -838,15 +882,19 @@ test("val(String)", function() {
var scriptorder = 0;
test("html(String)", function() {
- expect(9);
+ expect(10);
var div = $("div");
div.html("test");
var pass = true;
for ( var i = 0; i < div.size(); i++ ) {
- if ( div.get(i).childNodes.length == 0 ) pass = false;
+ if ( div.get(i).childNodes.length == 0 ) pass = false;
}
ok( pass, "Set HTML" );
+ $("#main").html("");
+ $("#main select").html("");
+ equals( $("#main select").val(), "O2", "Selected option correct" );
+
stop();
$("#main").html('');