[Bugfix beta] map.has where map.length === 0 should return false not …

…undefined.
emberjs · Oct 2, 2014 · 63df972 · 63df972
1 parent e280dc6
commit 63df972
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/packages/ember-metal/lib/map.js b/packages/ember-metal/lib/map.js
@@ -171,7 +171,7 @@ OrderedSet.prototype = {
     @return {Boolean}
   */
   has: function(obj) {
-    if (this.size === 0) { return; }
+    if (this.size === 0) { return false; }
 
     var guid = guidFor(obj);
     var presenceSet = this.presenceSet;
@@ -372,7 +372,7 @@ Map.prototype = {
     @return {Boolean} true if the item was present, false otherwise
   */
   has: function(key) {
-    if (this.size === 0) { return; }
+    if (this.size === 0) { return false; }
     return this.keys.has(key);
   },
 

diff --git a/packages/ember-metal/tests/map_test.js b/packages/ember-metal/tests/map_test.js
@@ -136,6 +136,11 @@ function testMap(nameAndFunc) {
     mapHasEntries([]);
   });
 
+  test("has empty collection", function() {
+    equal(map.has('foo'), false);
+    equal(map.has(), false);
+  });
+
   test("delete", function() {
     expectNoDeprecation();