Fixes $.trim for   closes #4980

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

diff --git a/test/unit/core.js b/test/unit/core.js
index b355a8c..0640cf5 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -189,6 +189,17 @@ test("noConflict", function() {
        jQuery = $$;
 });
 
+test("trim", function() {
+  expect(4);
+
+  var nbsp = String.fromCharCode(160);
+
+  equals( jQuery.trim("hello  "), "hello", "trailing space" );
+  equals( jQuery.trim("  hello"), "hello", "leading space" );
+  equals( jQuery.trim("  hello   "), "hello", "space on both sides" );
+  equals( jQuery.trim("  " + nbsp + "hello  " + nbsp + " "), "hello", " " );
+});
+
 test("isFunction", function() {
        expect(19);
 
@@ -500,7 +511,7 @@ test("index(Object|String|undefined)", function() {
 });
 
 test("jQuery.merge()", function() {
-       expect(6);
+       expect(8);
 
        var parse = jQuery.merge;
 
@@ -514,10 +525,14 @@ test("jQuery.merge()", function() {
 
        // Fixed at [5998], #3641
        same( parse([-2,-1], [0,1,2]), [-2,-1,0,1,2], "Second array including a zero (falsy)");
+       
+       // After fixing #5527
+       same( parse([], [null, undefined]), [null, undefined], "Second array including null and undefined values");
+       same( parse({length:0}, [1,2]), {length:2, 0:1, 1:2}, "First array like");
 });
 
 test("jQuery.extend(Object, Object)", function() {
-       expect(23);
+       expect(25);
 
        var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
                options = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
@@ -553,16 +568,20 @@ test("jQuery.extend(Object, Object)", function() {
        same( empty.foo, optionsWithDate.foo, "Dates copy correctly" );
 
        var myKlass = function() {};
-       var optionsWithCustomObject = { foo: { date: new myKlass } };
+       var customObject = new myKlass();
+       var optionsWithCustomObject = { foo: { date: customObject } };
        empty = {};
        jQuery.extend(true, empty, optionsWithCustomObject);
-       same( empty.foo, optionsWithCustomObject.foo, "Custom objects copy correctly (no methods)" );
+       ok( empty.foo && empty.foo.date === customObject, "Custom objects copy correctly (no methods)" );
        
        // Makes the class a little more realistic
        myKlass.prototype = { someMethod: function(){} };
        empty = {};
        jQuery.extend(true, empty, optionsWithCustomObject);
-       same( empty.foo, optionsWithCustomObject.foo, "Custom objects copy correctly" );
+       ok( empty.foo && empty.foo.date === customObject, "Custom objects copy correctly" );
+       
+       var ret = jQuery.extend(true, { foo: 4 }, { foo: new Number(5) } );
+       ok( ret.foo == 5, "Wrapped numbers copy correctly" );
 
        var nullUndef;
        nullUndef = jQuery.extend({}, options, { xnumber2: null });