X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=5101f8181a1c01dfe47aaf7eaa2984c0b5c6a173;hb=98204c7f6022958f277a7ea3bb8eacdc369753a4;hp=f5fc895a4e3e7bbf5ea0ef29002b80946a6a763a;hpb=14b88f6019cd467c35a2c9e845740a61c153525e;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index f5fc895..5101f81 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);