[CLEANUP beta] Remove length from OrderedSet and Map.

emberjs · Jul 21, 2015 · 836e706 · 836e706
1 parent b4d02fd
commit 836e706
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 38 deletions.
diff --git a/packages/ember-metal/lib/map.js b/packages/ember-metal/lib/map.js
@@ -23,7 +23,6 @@
 
 import Ember from 'ember-metal/core';
 import { guidFor } from 'ember-metal/utils';
-import { deprecateProperty } from 'ember-metal/deprecate_property';
 
 function missingFunction(fn) {
   throw new TypeError(`${Object.prototype.toString.call(fn)} is not a function`);
@@ -420,8 +419,6 @@ Map.prototype = {
   }
 };
 
-deprecateProperty(Map.prototype, 'length', 'size', { id: 'ember-metal.map-length', until: '3.0.0' });
-
 /**
   @class MapWithDefault
   @namespace Ember

diff --git a/packages/ember-metal/tests/map_test.js b/packages/ember-metal/tests/map_test.js
@@ -185,41 +185,6 @@ function testMap(nameAndFunc) {
     mapHasEntries([], map2);
   });
 
-  QUnit.test('length', function() {
-    expectDeprecation('Usage of `length` is deprecated, use `size` instead.');
-
-    //Add a key twice
-    equal(map.length, 0);
-    map.set(string, 'a string');
-    equal(map.length, 1);
-    map.set(string, 'the same string');
-    equal(map.length, 1);
-
-    //Add another
-    map.set(number, 'a number');
-    equal(map.length, 2);
-
-    //Remove one that doesn't exist
-    map.delete('does not exist');
-    equal(map.length, 2);
-
-    //Check copy
-    var copy = map.copy();
-    equal(copy.length, 2);
-
-    //Remove a key twice
-    map.delete(number);
-    equal(map.length, 1);
-    map.delete(number);
-    equal(map.length, 1);
-
-    //Remove the last key
-    map.delete(string);
-    equal(map.length, 0);
-    map.delete(string);
-    equal(map.length, 0);
-  });
-
   QUnit.test('size', function() {
     //Add a key twice
     equal(map.size, 0);