[BUGFIX release] Remove store method deprecations

packages/ember-data/lib/system/store.js

@@ -1844,15 +1844,9 @@ Store = Service.extend({
     @param {String} modelName
     @return DS.Adapter
   */
-  adapterFor: function(modelOrClass) {
-    var modelName;
+  adapterFor: function(modelName) {
 
-    if (typeof modelOrClass === 'string') {
-      modelName = modelOrClass;
-    } else {
-      Ember.deprecate(`Passing classes to store methods has been removed. Please pass a dasherized string instead of ${Ember.inspect(modelName)}`, false, { id: 'ds.store.passing-classes-deprecated', until: '2.0.0' });
-      modelName = modelOrClass.modelName;
-    }
+    Ember.assert(`Passing classes to store.adapterFor has been removed. Please pass a dasherized string instead of ${Ember.inspect(modelName)}`, typeof modelName === 'string');
 
     return this.lookupAdapter(modelName);
   },
@@ -1886,15 +1880,9 @@ Store = Service.extend({
     @param {String} modelName the record to serialize
     @return {DS.Serializer}
   */
-  serializerFor: function(modelOrClass) {
-    var modelName;
+  serializerFor: function(modelName) {
 
-    if (typeof modelOrClass === 'string') {
-      modelName = modelOrClass;
-    } else {
-      Ember.deprecate(`Passing classes to store methods has been removed. Please pass a dasherized string instead of ${Ember.inspect(modelName)}`, false, { id: 'ds.store.passing-classes-deprecated', until: '2.0.0' });
-      modelName = modelOrClass.modelName;
-    }
+    Ember.assert(`Passing classes to store.serializerFor has been removed. Please pass a dasherized string instead of ${Ember.inspect(modelName)}`, typeof modelName === 'string');
 
     var fallbacks = [
       'application',

packages/ember-data/tests/unit/store/adapter-interop-test.js

@@ -1233,6 +1233,20 @@ test("store should reload all records in the background when `shouldBackgroundRe
   equal(store.peekRecord('person', 1).get('name'), 'Tom');
 });
 
+test("Calling adapterFor with a model class should assert", function() {
+  var Person = DS.Model.extend({
+    name: DS.attr('string')
+  });
+
+  store = createStore({
+    person: Person
+  });
+
+  expectAssertion(function() {
+    store.adapterFor(Person);
+  }, /Passing classes to store.adapterFor has been removed/);
+});
+
 
 module("unit/store/adapter_interop - find preload deprecations", {
   setup: function() {

packages/ember-data/tests/unit/store/serializer-for-test.js

@@ -1,9 +1,10 @@
-var container, store, registry;
+var container, store, registry, Person;
 var run = Ember.run;
 
 module("unit/store/serializer_for - DS.Store#serializerFor", {
   setup: function() {
-    var env = setupStore({ person: DS.Model.extend() });
+    Person = DS.Model.extend({});
+    var env = setupStore({ person: Person });
     store = env.store;
     container = store.container;
     registry = env.registry;
@@ -36,3 +37,9 @@ test("Calling serializerFor with a type that has not been registered looks up th
 test("Calling serializerFor with a type that has not been registered and in an application that does not have an ApplicationSerializer looks up the default Ember Data serializer", function() {
   ok(store.serializerFor('person') instanceof DS.JSONSerializer, "serializer returned from serializerFor is an instance of DS.JSONSerializer");
 });
+
+test("Calling serializerFor with a model class should assert", function() {
+  expectAssertion(function() {
+    store.serializerFor(Person);
+  }, /Passing classes to store.serializerFor has been removed/);
+});