Merge pull request #16433 from emberjs/rwjblue-remove-content-alias

Remove content alias
emberjs · Mar 28, 2018 · 0fed741 · 0fed741
2 parents c6616bf + 8089eb5
commit 0fed741
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 21 deletions.
diff --git a/packages/ember-runtime/lib/mixins/controller.js b/packages/ember-runtime/lib/mixins/controller.js
@@ -1,5 +1,4 @@
 import { Mixin } from 'ember-metal';
-import { deprecatingAlias } from '../computed/computed_macros';
 import ActionHandler from './action_handler';
 
 /**
@@ -40,13 +39,4 @@ export default Mixin.create(ActionHandler, {
     @public
   */
   model: null,
-
-  /**
-    @private
-  */
-  content: deprecatingAlias('model', {
-    id: 'ember-runtime.controller.content-alias',
-    until: '2.17.0',
-    url: 'https://emberjs.com/deprecations/v2.x/#toc_controller-content-alias'
-  })
 });
diff --git a/packages/ember-runtime/tests/controllers/controller_test.js b/packages/ember-runtime/tests/controllers/controller_test.js
@@ -106,17 +106,6 @@ QUnit.module('Controller deprecations');
 
 QUnit.module('Controller Content -> Model Alias');
 
-QUnit.test('`content` is a deprecated alias of `model`', function(assert) {
-  assert.expect(2);
-  let controller = Controller.extend({
-    model: 'foo-bar'
-  }).create();
-
-  expectDeprecation(function () {
-    assert.equal(controller.get('content'), 'foo-bar', 'content is an alias of model');
-  });
-});
-
 QUnit.test('`content` is not moved to `model` when `model` is unset', function(assert) {
   assert.expect(2);
   let controller;