X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=eec3d7cdfdce3443f1db3796d1bd48a45cb6cd0b;hb=6a1d4f1a80e09e3857f25bb6eb7b190a3a9a4de0;hp=3960a7df9b389909a1aa0c5983a2f80756ade04c;hpb=396dd2127330a7ed742d1e9092af54b668c46e85;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index 3960a7d..eec3d7c 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -183,7 +183,7 @@ test("browser", function() {
 }
 
 test("noConflict", function() {
-	expect(6);
+	expect(7);
 
 	var $$ = jQuery;
 
@@ -196,6 +196,7 @@ test("noConflict", function() {
 	equals( jQuery.noConflict(true), $$, "noConflict returned the jQuery object" );
 	equals( jQuery, originaljQuery, "Make sure jQuery was reverted." );
 	equals( $, original$, "Make sure $ was reverted." );
+	ok( $$("#main").html("test"), "Make sure that jQuery still works." );
 
 	jQuery = $$;
 });
@@ -217,6 +218,29 @@ test("trim", function() {
 	equals( jQuery.trim( false ), "false", "Boolean" );
 });
 
+test("type", function() {
+	expect(18);
+
+	equals( jQuery.type(null), "null", "null" );
+	equals( jQuery.type(undefined), "undefined", "undefined" );
+	equals( jQuery.type(true), "boolean", "Boolean" );
+	equals( jQuery.type(false), "boolean", "Boolean" );
+	equals( jQuery.type(Boolean(true)), "boolean", "Boolean" );
+	equals( jQuery.type(0), "number", "Number" );
+	equals( jQuery.type(1), "number", "Number" );
+	equals( jQuery.type(Number(1)), "number", "Number" );
+	equals( jQuery.type(""), "string", "String" );
+	equals( jQuery.type("a"), "string", "String" );
+	equals( jQuery.type(String("a")), "string", "String" );
+	equals( jQuery.type({}), "object", "Object" );
+	equals( jQuery.type(/foo/), "regexp", "RegExp" );
+	equals( jQuery.type(new RegExp("asdf")), "regexp", "RegExp" );
+	equals( jQuery.type([1]), "array", "Array" );
+	equals( jQuery.type(new Date()), "date", "Date" );
+	equals( jQuery.type(new Function("return;")), "function", "Function" );
+	equals( jQuery.type(function(){}), "function", "Function" );
+});
+
 test("isPlainObject", function() {
 	expect(14);
 
@@ -408,6 +432,25 @@ test("isXMLDoc - XML", function() {
 });
 }
 
+test("isWindow", function() {
+	expect( 12 );
+
+	ok( jQuery.isWindow(window), "window" );
+	ok( !jQuery.isWindow(), "empty" );
+	ok( !jQuery.isWindow(null), "null" );
+	ok( !jQuery.isWindow(undefined), "undefined" );
+	ok( !jQuery.isWindow(document), "document" );
+	ok( !jQuery.isWindow(document.documentElement), "documentElement" );
+	ok( !jQuery.isWindow(""), "string" );
+	ok( !jQuery.isWindow(1), "number" );
+	ok( !jQuery.isWindow(true), "boolean" );
+	ok( !jQuery.isWindow({}), "object" );
+	// HMMM
+	// ok( !jQuery.isWindow({ setInterval: function(){} }), "fake window" );
+	ok( !jQuery.isWindow(/window/), "regexp" );
+	ok( !jQuery.isWindow(function(){}), "function" );
+});
+
 test("jQuery('html')", function() {
 	expect(15);