Merge pull request #3717 from greyhwndz/remove-fixture-adapter-refere…

…nces Remove Fixture Adapter
emberjs · Aug 30, 2015 · 6dac777 · 6dac777
2 parents 6ac8a85 + 60b7ae7
commit 6dac777
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 339 deletions.
diff --git a/packages/ember-data/lib/adapters.js b/packages/ember-data/lib/adapters.js
@@ -2,12 +2,10 @@
   @module ember-data
 */
 
-import FixtureAdapter from "ember-data/adapters/fixture-adapter";
 import JSONAPIAdapter from "ember-data/adapters/json-api-adapter";
 import RESTAdapter from "ember-data/adapters/rest-adapter";
 
 export {
-  FixtureAdapter,
   JSONAPIAdapter,
   RESTAdapter
 };
diff --git a/packages/ember-data/lib/adapters/fixture-adapter.js b/packages/ember-data/lib/adapters/fixture-adapter.js
diff --git a/packages/ember-data/lib/main.js b/packages/ember-data/lib/main.js
@@ -57,7 +57,6 @@ import {
 import ManyArray from "ember-data/system/many-array";
 import RecordArrayManager from "ember-data/system/record-array-manager";
 import {
-  FixtureAdapter,
   JSONAPIAdapter,
   RESTAdapter
 } from "ember-data/adapters";
@@ -153,23 +152,6 @@ Object.defineProperty(DS, 'normalizeModelName', {
   value: normalizeModelName
 });
 
-var _FixtureAdapter = FixtureAdapter;
-
-Object.defineProperty(DS, 'FixtureAdapter', {
-  get: function() {
-    if (_FixtureAdapter === FixtureAdapter) {
-      Ember.deprecate('DS.FixtureAdapter has been deprecated and moved into an unsupported addon: https://github.com/emberjs/ember-data-fixture-adapter/tree/master', false, {
-        id: 'ds.adapter.fixture-adapter-deprecated',
-        until: '2.0.0'
-      });
-    }
-    return _FixtureAdapter;
-  },
-  set:  function(FixtureAdapter) {
-    _FixtureAdapter = FixtureAdapter;
-  }
-});
-
 Ember.lookup.DS = DS;
 
 export default DS;