From a920ae9cd72c60a1e9cafe94d551df93afc0d79b Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Thu, 7 Jan 2016 11:06:23 +0100
Subject: [PATCH] [deprecations] Use modelName instead of typeKey

---
 app/adapters/env-var.js        | 4 ++--
 app/adapters/ssh-key.js        | 2 +-
 app/utils/test-auth.js         | 2 +-
 config/deprecation-workflow.js | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/adapters/env-var.js b/app/adapters/env-var.js
index 4aaca486..c11aa424 100644
--- a/app/adapters/env-var.js
+++ b/app/adapters/env-var.js
@@ -17,10 +17,10 @@ export default ApplicationAdapter.extend({
   updateRecord(store, type, record) {
     var data, id, serializer;
     data = {};
-    serializer = store.serializerFor(type.typeKey);
+    serializer = store.serializerFor(type.modelName);
     serializer.serializeIntoHash(data, type, record);
     id = Ember.get(record, 'id');
-    return this.ajax(this.buildURL(type.typeKey, id, record), "PATCH", {
+    return this.ajax(this.buildURL(type.modelName, id, record), "PATCH", {
       data: data
     });
   }
diff --git a/app/adapters/ssh-key.js b/app/adapters/ssh-key.js
index 2d27f0ba..165c5a2b 100644
--- a/app/adapters/ssh-key.js
+++ b/app/adapters/ssh-key.js
@@ -17,7 +17,7 @@ export default ApplicationAdapter.extend({
   createRecord(store, type, record) {
     var data, id, serializer;
     data = {};
-    serializer = store.serializerFor(type.typeKey);
+    serializer = store.serializerFor(type.modelName);
     serializer.serializeIntoHash(data, type, record, {
       includeId: true
     });
diff --git a/app/utils/test-auth.js b/app/utils/test-auth.js
index 5d616a31..860bfa06 100644
--- a/app/utils/test-auth.js
+++ b/app/utils/test-auth.js
@@ -13,7 +13,7 @@ export default Ember.Object.extend({
 
   signInForTests(user) {
     this.set('state', 'signed-in');
-    if ((user.constructor.typeKey != null) !== 'user') {
+    if ((user.constructor.modelName != null) !== 'user') {
       this.store.push({
         data: {
           type: 'user',
diff --git a/config/deprecation-workflow.js b/config/deprecation-workflow.js
index 0b20489e..82f2a2d2 100644
--- a/config/deprecation-workflow.js
+++ b/config/deprecation-workflow.js
@@ -11,6 +11,7 @@ window.deprecationWorkflow.config = {
     // internal component's state
     { handler: "log", matchMessage: "Usage of `state` is deprecated, use `_state` instead." },
     { handler: "log", matchMessage: "RestAdapter#find has been deprecated and renamed to `findRecord`." },
+    { handler: "log", matchMessage: "Usage of `typeKey` has been deprecated and will be removed in Ember Data 2.0. It has been replaced by `modelName` on the model class." },
 
     // TODO
     { handler: "silence", matchMessage: "Ember.View is deprecated. Consult the Deprecations Guide for a migration strategy." },
@@ -23,6 +24,5 @@ window.deprecationWorkflow.config = {
     { handler: "silence", matchMessage: "Using the same function as getter and setter is deprecated." },
     { handler: "silence", matchMessage: "Using store.dematerializeRecord() has been deprecated since it was intended for private use only. You should use store.unloadRecord() instead." },
     { handler: "silence", matchMessage: "Using DS.Snapshot.get() is deprecated. Use .attr(), .belongsTo() or .hasMany() instead." },
-    { handler: "silence", matchMessage: "Usage of `typeKey` has been deprecated and will be removed in Ember Data 2.0. It has been replaced by `modelName` on the model class." }
   ]
 };