Merge pull request #11809 from martndemus/remove-deprecated-map-remove

[CLEANUP beta] Remove deprecated Map#remove

packages/ember-metal/lib/map.js

@@ -118,21 +118,6 @@ OrderedSet.prototype = {
     return this;
   },
 
-  /**
-    @deprecated
-
-    @method remove
-    @param obj
-    @param _guid (optional and for internal use only)
-    @return {Boolean}
-    @private
-  */
-  remove(obj, _guid) {
-    Ember.deprecate('Calling `OrderedSet.prototype.remove` has been deprecated, please use `OrderedSet.prototype.delete` instead.', this._silenceRemoveDeprecation);
-
-    return this.delete(obj, _guid);
-  },
-
   /**
     @since 1.8.0
     @method delete
@@ -341,21 +326,6 @@ Map.prototype = {
     return this;
   },
 
-  /**
-    @deprecated see delete
-    Removes a value from the map for an associated key.
-
-    @method remove
-    @param {*} key
-    @return {Boolean} true if an item was removed, false otherwise
-    @private
-  */
-  remove(key) {
-    Ember.deprecate('Calling `Map.prototype.remove` has been deprecated, please use `Map.prototype.delete` instead.');
-
-    return this.delete(key);
-  },
-
   /**
     Removes a value from the map for an associated key.
 

packages/ember-metal/tests/map_test.js

@@ -119,23 +119,6 @@ function testMap(nameAndFunc) {
     equal(map.forEach.length, 1, 'expected arity for map.forEach is 1');
   });
 
-  QUnit.test('remove', function() {
-    map.set(object, 'winning');
-    map.set(number, 'winning');
-    map.set(string, 'winning');
-
-    expectDeprecation(function() {
-      map.remove(object);
-      map.remove(number);
-      map.remove(string);
-
-      // doesn't explode
-      map.remove({});
-    }, 'Calling `Map.prototype.remove` has been deprecated, please use `Map.prototype.delete` instead.');
-
-    mapHasEntries([]);
-  });
-
   QUnit.test('has empty collection', function() {
     equal(map.has('foo'), false);
     equal(map.has(), false);