From 3df86e697a03a3f370156b887e81c0885c8f18ec Mon Sep 17 00:00:00 2001
From: Bj <btecu@outlook.com>
Date: Tue, 3 Apr 2018 19:26:34 -0400
Subject: [PATCH] Remove deprecated `MODEL_FACTORY_INJECTIONS`

---
 packages/ember/lib/index.js            | 18 ------------------
 packages/ember/tests/reexports_test.js | 22 ----------------------
 2 files changed, 40 deletions(-)

diff --git a/packages/ember/lib/index.js b/packages/ember/lib/index.js
index 6f742399ccb..04b159748a4 100644
--- a/packages/ember/lib/index.js
+++ b/packages/ember/lib/index.js
@@ -1,5 +1,4 @@
 import require, { has } from 'require';
-import { DEBUG } from 'ember-env-flags';
 
 // ****ember-environment****
 import { ENV, context } from 'ember-environment';
@@ -33,7 +32,6 @@ Ember.Registry = Registry;
 // need to import this directly, to ensure the babel feature
 // flag plugin works properly
 import * as EmberDebug from 'ember-debug';
-import { deprecate } from 'ember-debug';
 
 // Using _globalsComputed here so that mutating the function is only available
 // in globals builds
@@ -194,22 +192,6 @@ Object.defineProperty(Ember, 'LOG_VERSION', {
   enumerable: false,
 });
 
-if (DEBUG) {
-  Object.defineProperty(Ember, 'MODEL_FACTORY_INJECTIONS', {
-    get() {
-      return false;
-    },
-    set() {
-      deprecate('Ember.MODEL_FACTORY_INJECTIONS is no longer required', false, {
-        id: 'ember-metal.model_factory_injections',
-        until: '2.17.0',
-        url: 'https://emberjs.com/deprecations/v2.x/#toc_id-ember-metal-model_factory_injections',
-      });
-    },
-    enumerable: false,
-  });
-}
-
 Object.defineProperty(Ember, 'LOG_BINDINGS', {
   get() {
     return ENV.LOG_BINDINGS;
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 037af36a21c..bbc5fa3424d 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -1,7 +1,6 @@
 import Ember from '../index';
 import { ENV } from 'ember-environment';
 import { confirmExport } from 'internal-test-helpers';
-import { DEBUG } from 'ember-env-flags';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
@@ -23,27 +22,6 @@ moduleFor(
     ['@test Ember.String.isHTMLSafe exports correctly'](assert) {
       confirmExport(Ember, assert, 'String.isHTMLSafe', 'ember-glimmer', 'isHTMLSafe');
     }
-
-    ['@test Ember.MODEL_FACTORY_INJECTIONS'](assert) {
-      if (DEBUG) {
-        let descriptor = Object.getOwnPropertyDescriptor(Ember, 'MODEL_FACTORY_INJECTIONS');
-        assert.equal(descriptor.enumerable, false, 'descriptor is not enumerable');
-        assert.equal(descriptor.configurable, false, 'descriptor is not configurable');
-
-        assert.equal(Ember.MODEL_FACTORY_INJECTIONS, false);
-
-        expectDeprecation(function() {
-          Ember.MODEL_FACTORY_INJECTIONS = true;
-        }, 'Ember.MODEL_FACTORY_INJECTIONS is no longer required');
-        assert.equal(
-          Ember.MODEL_FACTORY_INJECTIONS,
-          false,
-          'writing to the property has no affect'
-        );
-      } else {
-        assert.expect(0);
-      }
-    }
   }
 );