deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Corrected some minor errors made by me (rkatic) in last commits.

Browse source
This commit is contained in:
Robert Katic 2009-11-12 23:24:19 +08:00 committed by John Resig
parent 7b26e3bcc8
commit ee9192d103
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/unit/core.js
View file

@ -517,7 +517,7 @@ test("jQuery.merge()", function() {
});
test("jQuery.extend(Object, Object)", function() {
expect(24);
expect(25);
var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
options = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
@ -557,13 +557,13 @@ test("jQuery.extend(Object, Object)", function() {
var optionsWithCustomObject = { foo: { date: new customObject } };
empty = {};
jQuery.extend(true, empty, optionsWithCustomObject);
ok( empty.foo && empty.foo.date && empty.foo.date === customObject, "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);
ok( empty.foo && empty.foo.date && empty.foo.date === customObject, "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" );