aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDan Heberden <danheberden@gmail.com>2011-03-21 08:04:35 -0700
committerDan Heberden <danheberden@gmail.com>2011-03-21 08:04:35 -0700
commitf0e7d28e83266b4c186e916346d81fec71053d28 (patch)
treed872bc8fa477dc9d420ae15bf7669df6fa7c3881 /test
parent5c79f82ec2e866a5d7cd1775382f6221e3937275 (diff)
parentc8a887af066a62840ec1910604ddb7e0c38728e8 (diff)
downloadjquery-f0e7d28e83266b4c186e916346d81fec71053d28.tar.gz
jquery-f0e7d28e83266b4c186e916346d81fec71053d28.zip
Merge branch 'bug_2616' of https://github.com/jboesch/jquery into map-object.1.6
* 'bug_2616' of https://github.com/jboesch/jquery: Bug 2616; Adding object support to jQuery.map
Diffstat (limited to 'test')
-rw-r--r--test/unit/core.js12
1 files changed, 5 insertions, 7 deletions
diff --git a/test/unit/core.js b/test/unit/core.js
index 6ee8724de..c1ffe10b4 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -608,7 +608,7 @@ test("first()/last()", function() {
});
test("map()", function() {
- expect(2);//expect(6);
+ expect(6);
same(
jQuery("#ap").map(function(){
@@ -625,26 +625,24 @@ test("map()", function() {
q("ap","ap","ap"),
"Single Map"
);
-
- return;//these haven't been accepted yet
-
+
//for #2616
var keys = jQuery.map( {a:1,b:2}, function( v, k ){
return k;
- }, [ ] );
+ });
equals( keys.join(""), "ab", "Map the keys from a hash to an array" );
var values = jQuery.map( {a:1,b:2}, function( v, k ){
return v;
- }, [ ] );
+ });
equals( values.join(""), "12", "Map the values from a hash to an array" );
var scripts = document.getElementsByTagName("script");
var mapped = jQuery.map( scripts, function( v, k ){
return v;
- }, {length:0} );
+ });
equals( mapped.length, scripts.length, "Map an array(-like) to a hash" );