git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7b26e3b
)
Corrected some minor errors made by me (rkatic) in last commits.
author
Robert Katic
<robert.katic@gmail.com>
Thu, 12 Nov 2009 15:24:19 +0000
(23:24 +0800)
committer
John Resig
<jeresig@gmail.com>
Fri, 13 Nov 2009 00:09:46 +0000
(08:09 +0800)
test/unit/core.js
patch
|
blob
|
history
diff --git
a/test/unit/core.js
b/test/unit/core.js
index
058e11f
..
7a2c4d6
100644
(file)
--- a/
test/unit/core.js
+++ b/
test/unit/core.js
@@
-517,7
+517,7
@@
test("jQuery.merge()", function() {
});
test("jQuery.extend(Object, Object)", 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" },
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);
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);
// 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" );
var ret = jQuery.extend(true, { foo: 4 }, { foo: new Number(5) } );
ok( ret.foo == 5, "Wrapped numbers copy correctly" );