git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Corrected RegExp to match event namespaces. Fixes #5303.
[jquery.git]
/
test
/
unit
/
core.js
diff --git
a/test/unit/core.js
b/test/unit/core.js
index
058e11f
..
4044bd8
100644
(file)
--- a/
test/unit/core.js
+++ b/
test/unit/core.js
@@
-500,7
+500,7
@@
test("index(Object|String|undefined)", function() {
});
test("jQuery.merge()", function() {
});
test("jQuery.merge()", function() {
- expect(6);
+ expect(8);
var parse = jQuery.merge;
var parse = jQuery.merge;
@@
-514,10
+514,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)");
// 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() {
});
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" },
@@
-554,16
+558,16
@@
test("jQuery.extend(Object, Object)", function() {
var myKlass = function() {};
var customObject = new myKlass();
var myKlass = function() {};
var customObject = new myKlass();
- var optionsWithCustomObject = { foo: { date: new customObject } };
+ var optionsWithCustomObject = { foo: { date: customObject } };
empty = {};
jQuery.extend(true, empty, optionsWithCustomObject);
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" );