Deprecate Controller#content alias

features.json

@@ -35,10 +35,10 @@
     "ember-views.render-double-modify": "2.0.0",
     "ember-routing.router-resource": "2.0.0",
     "ember-routing.top-level-render-helper": "2.11.0",
+    "ember-runtime.controller-content": "2.16.0",
     "ember-runtime.controller-proxy": "2.0.0",
     "ember-runtime.action-handler-_actions": "2.0.0",
     "ember-runtime.enumerable-contains": "2.7.0",
-    "ember-runtime.will-merge-mixin": "2.0.0",
     "ember-runtime.frozen-copy": "2.0.0",
     "ember-runtime.freezable-init": "2.0.0",
     "ember-string-utils.fmt": "2.0.0",

packages/ember-runtime/lib/mixins/controller.js

@@ -1,14 +1,14 @@
 import { Mixin, alias } from 'ember-metal';
+import { deprecatingAlias } from '../computed/computed_macros';
 import ActionHandler from './action_handler';
-import ControllerContentModelAliasDeprecation from './controller_content_model_alias_deprecation';
 
 /**
   @class ControllerMixin
   @namespace Ember
   @uses Ember.ActionHandler
   @private
 */
-export default Mixin.create(ActionHandler, ControllerContentModelAliasDeprecation, {
+export default Mixin.create(ActionHandler, {
   /* ducktype as a controller */
   isController: true,
 
@@ -38,12 +38,15 @@ export default Mixin.create(ActionHandler, ControllerContentModelAliasDeprecatio
 
     @property model
     @public
-   */
+  */
   model: null,
 
   /**
     @private
   */
-  content: alias('model')
-
+  content: deprecatingAlias('model', {
+    id: 'ember-runtime.controller.content-alias',
+    until: '2.17.0',
+    url: 'https://emberjs.com/deprecations/v2.x/#toc_controller-content-alias'
+  })
 });

packages/ember-runtime/tests/controllers/controller_test.js

@@ -102,16 +102,18 @@ QUnit.module('Controller deprecations');
 
 QUnit.module('Controller Content -> Model Alias');
 
-QUnit.test('`model` is aliased as `content`', function() {
-  expect(1);
+QUnit.test('`content` is a deprecated alias of `model`', function() {
+  expect(2);
   let controller = Controller.extend({
     model: 'foo-bar'
   }).create();
 
-  equal(controller.get('content'), 'foo-bar', 'content is an alias of model');
+  expectDeprecation(function () {
+    equal(controller.get('content'), 'foo-bar', 'content is an alias of model');
+  });
 });
 
-QUnit.test('`content` is moved to `model` when `model` is unset', function() {
+QUnit.test('`content` is not moved to `model` when `model` is unset', function() {
   expect(2);
   let controller;
 
@@ -121,18 +123,19 @@ QUnit.test('`content` is moved to `model` when `model` is unset', function() {
     }).create();
   });
 
-  equal(controller.get('model'), 'foo-bar', 'model is set properly');
-  equal(controller.get('content'), 'foo-bar', 'content is set properly');
+  notEqual(controller.get('model'), 'foo-bar', 'model is set properly');
+  equal(controller.get('content'), 'foo-bar', 'content is not set properly');
 });
 
-QUnit.test('specifying `content` (without `model` specified) results in deprecation', function() {
-  expect(1);
+QUnit.test('specifying `content` (without `model` specified) does not result in deprecation', function() {
+  expect(2);
+  expectNoDeprecation();
 
-  expectDeprecation(function() {
-    Controller.extend({
-      content: 'foo-bar'
-    }).create();
-  }, 'Do not specify `content` on a Controller, use `model` instead.');
+  let controller = Controller.extend({
+    content: 'foo-bar'
+  }).create();
+
+  equal(get(controller, 'content'), 'foo-bar');
 });
 
 QUnit.test('specifying `content` (with `model` specified) does not result in deprecation', function() {