ember-data-source 1.13.4 → 1.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 697e9db009a98edf76770a04325a458d0883233b
-  data.tar.gz: c55896935e8b62f5354ad01c3b97abe5d9e0fc86
+  metadata.gz: f831525fdcf65ff5cf7c35181eb06c4262224558
+  data.tar.gz: c102fcd43f2ac52808268bc3cb16077e77fc6ff5
 SHA512:
-  metadata.gz: c22bae99bb68f26d374351eeef8cde7f40eb031c60d83a699a770332ee21b547d996e5e737aec70a65954ee9b67a88a124a07af2571636111f66ff0bb8569543
-  data.tar.gz: d09c254dbdb90ae9a5c1a0f90f8f6f7d749aaf5515cfecda1f9a1a0e5e316e00a3501251741d6ea17eeaa6ee0fcaea1693ef118e567dfa61a923949240f70027
+  metadata.gz: 2c74369d2d49d46ce7d5c721e2c6ad432b7fef68015f876a194906168ea55e5fded8fb24338d8c19b04b1b832482fe0be0ca4a89b3714f024782c75ea4e1f05a
+  data.tar.gz: 2f3f500fdd2e6ebb4dc84e6f92ef22797273f22fe085392d2532d6f59414b4a88ffd317a944c6fc62751d91dd755f617acd904329064fb86c151b2525e22bc4e

data/dist/ember-data-tests.js

@@ -196,7 +196,7 @@ define(
 
       var error = adapter.handleResponse(jqXHR.status, {}, json).errors[0];
 
-      equal(error.details, 'can\'t be blank');
+      equal(error.detail, 'can\'t be blank');
       equal(error.source.pointer, 'data/attributes/name');
     });
 
@@ -1201,7 +1201,7 @@ define(
           source: {
             pointer: 'data/attributes/first_name'
           },
-          details: 'firstName not evil enough'
+          detail: 'firstName not evil enough'
         }]
       };
 
@@ -2818,6 +2818,39 @@ define(
         });
       });
     });
+
+    test('fetching a belongsTo relationship link that returns null', function () {
+      expect(3);
+
+      ajaxResponse([{
+        data: {
+          type: 'post',
+          id: '1',
+          attributes: {
+            title: 'Ember.js rocks'
+          },
+          relationships: {
+            author: {
+              links: {
+                related: 'http://example.com/post/1/author'
+              }
+            }
+          }
+        }
+      }, {
+        data: null
+      }]);
+
+      run(function () {
+        store.find('post', 1).then(function (post) {
+          equal(passedUrl[0], '/posts/1');
+          return post.get('author');
+        }).then(function (author) {
+          equal(passedUrl[1], 'http://example.com/post/1/author');
+          equal(author, null);
+        });
+      });
+    });
   }
 );
 
@@ -3251,6 +3284,8 @@ define(
       __exports__[name] = value;
     }
 
+    var keysFunc = Object.keys || Ember.keys;
+
     var env, store, adapter, Post, Comment, SuperUser;
     var passedUrl, passedVerb, passedHash;
     var run = Ember.run;
@@ -4158,7 +4193,7 @@ define(
         passedVerb = verb;
         passedHash = hash;
 
-        deepEqual(Object.keys(hash.data), ["in", "order", "params", "wrong"], "query params are received in alphabetical order");
+        deepEqual(keysFunc(hash.data), ["in", "order", "params", "wrong"], "query params are received in alphabetical order");
 
         return run(Ember.RSVP, "resolve", { posts: [{ id: 1, name: "Rails is very expensive sushi" }] });
       };
@@ -4186,7 +4221,7 @@ define(
         passedVerb = verb;
         passedHash = hash;
 
-        deepEqual(Object.keys(hash.data), ["params", "in", "wrong", "order"], "query params are received in their original order");
+        deepEqual(keysFunc(hash.data), ["params", "in", "wrong", "order"], "query params are received in their original order");
 
         return run(Ember.RSVP, "resolve", { posts: [{ id: 1, name: "Rails is very expensive sushi" }] });
       };
@@ -4202,13 +4237,13 @@ define(
         passedVerb = verb;
         passedHash = hash;
 
-        deepEqual(Object.keys(hash.data), ["wrong", "params", "order", "in"], "query params are received in reverse alphabetical order");
+        deepEqual(keysFunc(hash.data), ["wrong", "params", "order", "in"], "query params are received in reverse alphabetical order");
 
         return run(Ember.RSVP, "resolve", { posts: [{ id: 1, name: "Rails is very expensive sushi" }] });
       };
 
       adapter.sortQueryParams = function (obj) {
-        var sortedKeys = Object.keys(obj).sort().reverse();
+        var sortedKeys = keysFunc(obj).sort().reverse();
         var len = sortedKeys.length;
         var newQueryParams = {};
 
@@ -4981,7 +5016,7 @@ define(
       try {
         run(function () {
           store.find("post", "1")["catch"](function (err) {
-            equal(err.errors[0].details, errorThrown);
+            equal(err.errors[0].detail, errorThrown);
             ok(err, "promise rejected");
           });
         });
@@ -6085,6 +6120,64 @@ define(
         store.findAll('person', { adapterOptions: { query: { embed: true } } });
       });
     });
+
+    test('Store does not error when the serializer is null', function () {
+      adapter.findRecord = function (store, type, query, recordArray) {
+        return {
+          id: 1,
+          name: 'Mickael Ramírez'
+        };
+      };
+
+      adapter.serializer = null;
+
+      run(store, 'findRecord', 'person', 1).then(async(function (person) {
+        equal(person.get('id'), 1);
+      }));
+    });
+
+    test('An async hasMany relationship with links should not trigger shouldBackgroundReloadRecord', function () {
+      var Post = DS.Model.extend({
+        name: DS.attr('string'),
+        comments: DS.hasMany('comment', { async: true })
+      });
+
+      var Comment = DS.Model.extend({
+        name: DS.attr('string')
+      });
+
+      env = setupStore({
+        post: Post,
+        comment: Comment,
+        adapter: DS.RESTAdapter.extend({
+          findRecord: function () {
+            return {
+              posts: {
+                id: 1,
+                name: 'Rails is omakase',
+                links: { comments: '/posts/1/comments' }
+              }
+            };
+          },
+          findHasMany: function () {
+            return Ember.RSVP.resolve({
+              comments: [{ id: 1, name: 'FIRST' }, { id: 2, name: 'Rails is unagi' }, { id: 3, name: 'What is omakase?' }]
+            });
+          },
+          shouldBackgroundReloadRecord: function () {
+            ok(false, 'shouldBackgroundReloadRecord should not be called');
+          }
+        })
+      });
+
+      store = env.store;
+
+      run(store, 'find', 'post', '1').then(async(function (post) {
+        return post.get('comments');
+      })).then(async(function (comments) {
+        equal(comments.get('length'), 3);
+      }));
+    });
   }
 );
 
@@ -6271,6 +6364,29 @@ define(
       ok(ran, 'ember-data initializer was found');
     });
 
+    test('ember-data initializer does not register the store service when it was already registered', function () {
+
+      var AppStore = Store.extend({
+        isCustomStore: true
+      });
+
+      App.initializer({
+        name: 'after-ember-data',
+        before: 'ember-data',
+        initialize: function (registry) {
+          registry.register('service:store', AppStore);
+        }
+      });
+
+      run(function () {
+        app = App.create();
+        container = app.__container__;
+      });
+
+      var store = getStore();
+      ok(store && store.get('isCustomStore'), 'ember-data initializer does not overwrite the previous registered service store');
+    });
+
     test('store initializer is run (DEPRECATED)', function () {
       var ran = false;
       App.initializer({
@@ -8850,6 +8966,8 @@ define(
       __exports__[name] = value;
     }
 
+    var keysFunc = Object.keys || Ember.keys;
+
     var attr = DS.attr;
     var belongsTo = DS.belongsTo;
     var hasMany = DS.hasMany;
@@ -8963,7 +9081,7 @@ define(
     test('Unloading all records for a given type clears saved meta data.', function () {
 
       function metadataKeys(type) {
-        return Ember.keys(env.store.metadataFor(type));
+        return keysFunc(env.store.metadataFor(type));
       }
 
       run(function () {
@@ -13557,7 +13675,7 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:home-planet');
+      var serializer = env.store.serializerFor('home-planet');
       var json_hash = {
         homePlanet: {
           id: '1',
@@ -13614,7 +13732,7 @@ define(
       }));
       env.registry.register('serializer:evil-minion', TestSerializer);
 
-      var serializer = env.container.lookup('serializer:home-planet');
+      var serializer = env.store.serializerFor('home-planet');
       var json_hash = {
         homePlanet: {
           id: '1',
@@ -13680,7 +13798,7 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:comment');
+      var serializer = env.store.serializerFor('comment');
       var json_hash = {
         comment: {
           id: '1',
@@ -13744,7 +13862,7 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:comment');
+      var serializer = env.store.serializerFor('comment');
       var json_hash = {
         comment: {
           id: '1',
@@ -13831,7 +13949,7 @@ define(
       }));
       env.registry.register('serializer:super-villain', TestSerializer);
 
-      var serializer = env.container.lookup('serializer:home-planet');
+      var serializer = env.store.serializerFor('home-planet');
       var json_hash = {
         homePlanet: {
           id: '1',
@@ -13914,7 +14032,7 @@ define(
       }));
       env.registry.register('serializer:super-villain', TestSerializer);
 
-      var serializer = env.container.lookup('serializer:home-planet');
+      var serializer = env.store.serializerFor('home-planet');
 
       var json_hash = {
         homePlanets: [{
@@ -13970,7 +14088,7 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:home-planet');
+      var serializer = env.store.serializerFor('home-planet');
 
       var json_hash = {
         homePlanets: [{
@@ -14028,7 +14146,7 @@ define(
       }));
       env.registry.register('serializer:super-villain', TestSerializer);
 
-      var serializer = env.container.lookup('serializer:home-planet');
+      var serializer = env.store.serializerFor('home-planet');
 
       var json_hash = {
         homePlanets: [{
@@ -14079,7 +14197,7 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:comment');
+      var serializer = env.store.serializerFor('comment');
 
       var json_hash = {
         comments: [{
@@ -14151,7 +14269,7 @@ define(
       }));
       env.registry.register('serializer:super-villain', TestSerializer);
 
-      var serializer = env.container.lookup('serializer:home-planet');
+      var serializer = env.store.serializerFor('home-planet');
       var json_hash = {
         homePlanets: [{
           id: '1',
@@ -14294,7 +14412,7 @@ define(
       }));
       //env.registry.register('serializer:secret-lab', TestSerializer);
 
-      var serializer = env.container.lookup('serializer:super-villain');
+      var serializer = env.store.serializerFor('super-villain');
 
       var json_hash = {
         superVillain: {
@@ -14365,7 +14483,7 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:evil-minion');
+      var serializer = env.store.serializerFor('evil-minion');
       var json_hash = {
         evilMinion: {
           id: '1',
@@ -14443,7 +14561,7 @@ define(
           secretWeapons: { embedded: 'always' }
         }
       }));
-      var serializer = env.container.lookup('serializer:super-villain');
+      var serializer = env.store.serializerFor('super-villain');
 
       var json_hash = {
         superVillain: {
@@ -14512,7 +14630,7 @@ define(
           secretLab: { embedded: 'always' }
         }
       }));
-      var serializer = env.container.lookup('serializer:super-villain');
+      var serializer = env.store.serializerFor('super-villain');
 
       var json_hash = {
         superVillain: {
@@ -14569,7 +14687,7 @@ define(
         primaryKey: 'custom'
       }));
 
-      var serializer = env.container.lookup('serializer:evil-minion');
+      var serializer = env.store.serializerFor('evil-minion');
       var json_hash = {
         evil_minion: {
           id: '1',
@@ -14707,7 +14825,7 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:home-planet');
+      var serializer = env.store.serializerFor('home-planet');
       var json_hash = {
         home_planet: {
           id: '1',
@@ -14750,7 +14868,7 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:home-planet');
+      var serializer = env.store.serializerFor('home-planet');
       var json_hash = {
         home_planet: {
           id: '1',
@@ -14797,7 +14915,8 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:comment');
+      var serializer = env.store.serializerFor('comment');
+
       var json_hash = {
         comment: {
           id: '1',
@@ -14837,7 +14956,7 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:comment');
+      var serializer = env.store.serializerFor('comment');
       var json_hash = {
         comment: {
           id: '1',
@@ -14890,7 +15009,7 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:home-planet');
+      var serializer = env.store.serializerFor('home-planet');
       var json_hash = {
         home_planet: {
           id: '1',
@@ -14937,7 +15056,7 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:home-planet');
+      var serializer = env.store.serializerFor('home-planet');
 
       var json_hash = {
         home_planets: [{
@@ -14981,7 +15100,7 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:home-planet');
+      var serializer = env.store.serializerFor('home-planet');
 
       var json_hash = {
         home_planets: [{
@@ -15026,7 +15145,7 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:home-planet');
+      var serializer = env.store.serializerFor('home-planet');
 
       var json_hash = {
         home_planets: [{
@@ -15065,7 +15184,7 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:comment');
+      var serializer = env.store.serializerFor('comment');
 
       var json_hash = {
         comments: [{
@@ -15113,7 +15232,7 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:home-planet');
+      var serializer = env.store.serializerFor('home-planet');
       var json_hash = {
         home_planets: [{
           id: '1',
@@ -15189,7 +15308,7 @@ define(
       }));
       var serializer, json;
       run(function () {
-        serializer = env.container.lookup('serializer:super-villain');
+        serializer = env.store.serializerFor('super-villain');
         json = serializer.serialize(tom._createSnapshot());
       });
 
@@ -15215,7 +15334,7 @@ define(
 
       var serializer, json;
       run(function () {
-        serializer = env.container.lookup('serializer:home-planet');
+        serializer = env.store.serializerFor('home-planet');
 
         json = serializer.serialize(league._createSnapshot());
       });
@@ -15247,7 +15366,7 @@ define(
       var serializer, json;
       warns(function () {
         run(function () {
-          serializer = env.container.lookup('serializer:home-planet');
+          serializer = env.store.serializerFor('home-planet');
           json = serializer.serialize(league._createSnapshot());
         });
       }, /The embedded relationship 'villains' is undefined for 'home-planet' with id '123'. Please include it in your original payload./);
@@ -15271,7 +15390,7 @@ define(
       }));
       var serializer, json;
       run(function () {
-        serializer = env.container.lookup('serializer:home-planet');
+        serializer = env.store.serializerFor('home-planet');
 
         json = serializer.serialize(league._createSnapshot());
       });
@@ -15294,7 +15413,7 @@ define(
       }));
       var serializer, json;
       run(function () {
-        serializer = env.container.lookup('serializer:home-planet');
+        serializer = env.store.serializerFor('home-planet');
 
         json = serializer.serialize(league._createSnapshot());
       });
@@ -15353,7 +15472,7 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:super-villain');
+      var serializer = env.store.serializerFor('super-villain');
 
       var json_hash = {
         super_villain: {
@@ -15404,7 +15523,7 @@ define(
       }));
       var serializer, json, tom;
       run(function () {
-        serializer = env.container.lookup('serializer:super-villain');
+        serializer = env.store.serializerFor('super-villain');
 
         // records with an id, persisted
 
@@ -15442,7 +15561,7 @@ define(
         primaryKey: 'crazy_id'
       }));
 
-      var serializer = env.container.lookup('serializer:super-villain');
+      var serializer = env.store.serializerFor('super-villain');
 
       // records with an id, persisted
       var tom, json;
@@ -15478,7 +15597,7 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:super-villain');
+      var serializer = env.store.serializerFor('super-villain');
 
       // records without ids, new
       var tom, json;
@@ -15512,7 +15631,7 @@ define(
           secretLab: { serialize: 'ids' }
         }
       }));
-      var serializer = env.container.lookup('serializer:super-villain');
+      var serializer = env.store.serializerFor('super-villain');
 
       // records with an id, persisted
       var tom, json;
@@ -15544,7 +15663,7 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:super-villain');
+      var serializer = env.store.serializerFor('super-villain');
 
       // records with an id, persisted
       var tom, json;
@@ -15576,7 +15695,7 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:super-villain');
+      var serializer = env.store.serializerFor('super-villain');
 
       // records with an id, persisted
       var tom, json;
@@ -15607,7 +15726,7 @@ define(
           secretLab: { serialize: false }
         }
       }));
-      var serializer = env.container.lookup('serializer:super-villain');
+      var serializer = env.store.serializerFor('super-villain');
 
       // records with an id, persisted
       var tom, json;
@@ -15632,7 +15751,7 @@ define(
     test('serialize with embedded object (belongsTo relationship) serializes the id by default if no option specified', function () {
       env.registry.register('adapter:super-villain', DS.ActiveModelAdapter);
       env.registry.register('serializer:super-villain', DS.ActiveModelSerializer.extend(DS.EmbeddedRecordsMixin));
-      var serializer = env.container.lookup('serializer:super-villain');
+      var serializer = env.store.serializerFor('super-villain');
 
       // records with an id, persisted
 
@@ -15664,7 +15783,7 @@ define(
           secretLab: { embedded: 'always' }
         }
       }));
-      var serializer = env.container.lookup('serializer:super-villain');
+      var serializer = env.store.serializerFor('super-villain');
       var tom, json;
 
       run(function () {
@@ -15698,7 +15817,7 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:evil-minion');
+      var serializer = env.store.serializerFor('evil-minion');
       var json_hash = {
         evil_minion: {
           id: '1',
@@ -15743,7 +15862,7 @@ define(
           secretWeapons: { embedded: 'always' }
         }
       }));
-      var serializer = env.container.lookup('serializer:super-villain');
+      var serializer = env.store.serializerFor('super-villain');
 
       var json_hash = {
         super_villain: {
@@ -15793,7 +15912,7 @@ define(
           secretWeapons: { embedded: 'always' }
         }
       }));
-      var serializer = env.container.lookup('serializer:super-villain');
+      var serializer = env.store.serializerFor('super-villain');
 
       var json_hash = {
         super_villain: {
@@ -15842,7 +15961,7 @@ define(
           secretLab: { embedded: 'always' }
         }
       }));
-      var serializer = env.container.lookup('serializer:super-villain');
+      var serializer = env.store.serializerFor('super-villain');
 
       var json_hash = {
         super_villain: {
@@ -15890,7 +16009,7 @@ define(
       env.registry.register('serializer:bat-cave', DS.ActiveModelSerializer.extend({
         primaryKey: 'custom'
       }));
-      var serializer = env.container.lookup('serializer:super-villain');
+      var serializer = env.store.serializerFor('super-villain');
 
       var json_hash = {
         super_villain: {
@@ -15938,7 +16057,7 @@ define(
       env.registry.register('serializer:bat-cave', DS.ActiveModelSerializer.extend({
         primaryKey: 'custom'
       }));
-      var serializer = env.container.lookup('serializer:super-villain');
+      var serializer = env.store.serializerFor('super-villain');
 
       var json_hash = {
         super_villain: {
@@ -15990,7 +16109,7 @@ define(
           evilMinions: { serialize: 'records', deserialize: 'records' }
         }
       }));
-      var serializer = env.container.lookup('serializer:super-villain');
+      var serializer = env.store.serializerFor('super-villain');
       var json;
 
       run(function () {
@@ -16023,7 +16142,7 @@ define(
         primaryKey: 'custom'
       }));
 
-      var serializer = env.container.lookup('serializer:evil-minion');
+      var serializer = env.store.serializerFor('evil-minion');
       var json_hash = {
         evil_minion: {
           id: '1',
@@ -16092,7 +16211,7 @@ define(
           // e.g. secretWeapons: { serialize: 'ids' }
         }
       }));
-      var serializer = env.container.lookup('serializer:super-villain');
+      var serializer = env.store.serializerFor('super-villain');
 
       var json;
       run(function () {
@@ -16136,7 +16255,7 @@ define(
         }
       }));
 
-      var serializer = env.container.lookup('serializer:evil-minion');
+      var serializer = env.store.serializerFor('evil-minion');
       var json;
 
       run(function () {
@@ -16208,7 +16327,7 @@ define(
         });
 
         store = env.store;
-        serializer = env.container.lookup('serializer:-json-api');
+        serializer = store.serializerFor('-json-api');
       },
 
       teardown: function () {
@@ -16533,7 +16652,7 @@ define(
       });
       var json = {};
 
-      env.container.lookup('serializer:post').serializeAttribute(post._createSnapshot(), json, 'title', { type: 'string' });
+      env.store.serializerFor('post').serializeAttribute(post._createSnapshot(), json, 'title', { type: 'string' });
 
       deepEqual(json, { TITLE: 'Rails is omakase' });
     });
@@ -16592,7 +16711,7 @@ define(
       });
       var json = {};
 
-      env.container.lookup('serializer:post').serializeBelongsTo(comment._createSnapshot(), json, { key: 'post', options: {} });
+      env.store.serializerFor('post').serializeBelongsTo(comment._createSnapshot(), json, { key: 'post', options: {} });
 
       deepEqual(json, {
         POST: '1'
@@ -16613,7 +16732,7 @@ define(
 
       var json = {};
 
-      env.container.lookup('serializer:post').serializeHasMany(post._createSnapshot(), json, { key: 'comments', options: {} });
+      env.store.serializerFor('post').serializeHasMany(post._createSnapshot(), json, { key: 'comments', options: {} });
 
       deepEqual(json, {
         COMMENTS: ['1']
@@ -16653,7 +16772,7 @@ define(
         comment = env.store.createRecord('comment', { body: 'Omakase is delicious', post: post });
       });
 
-      env.container.lookup('serializer:comment').serializeBelongsTo(comment._createSnapshot(), {}, { key: 'post', options: { polymorphic: true } });
+      env.store.serializerFor('comment').serializeBelongsTo(comment._createSnapshot(), {}, { key: 'post', options: { polymorphic: true } });
     });
 
     test('serializePolymorphicType async', function () {
@@ -16674,7 +16793,7 @@ define(
         comment = env.store.createRecord('comment', { body: 'Omakase is delicious', post: post });
       });
 
-      env.container.lookup('serializer:comment').serializeBelongsTo(comment._createSnapshot(), {}, { key: 'post', options: { async: true, polymorphic: true } });
+      env.store.serializerFor('comment').serializeBelongsTo(comment._createSnapshot(), {}, { key: 'post', options: { async: true, polymorphic: true } });
     });
 
     test('extractArray normalizes each record in the array', function () {
@@ -16689,7 +16808,7 @@ define(
       }));
 
       run(function () {
-        env.container.lookup('serializer:post').extractArray(env.store, Post, posts);
+        env.store.serializerFor('post').extractArray(env.store, Post, posts);
       });
       equal(postNormalizeCount, 2, 'two posts are normalized');
     });
@@ -16707,7 +16826,7 @@ define(
         my_comments: [1, 2]
       };
 
-      var post = env.container.lookup('serializer:post').extractSingle(env.store, Post, jsonHash);
+      var post = env.store.serializerFor('post').extractSingle(env.store, Post, jsonHash);
 
       equal(post.title, 'Rails is omakase');
       deepEqual(post.comments, [1, 2]);
@@ -16730,7 +16849,7 @@ define(
         post = env.store.createRecord('post', { title: 'Rails is omakase', parentPost: parentPost });
       });
 
-      var payload = env.container.lookup('serializer:post').serialize(post._createSnapshot());
+      var payload = env.store.serializerFor('post').serialize(post._createSnapshot());
 
       equal(payload.title_payload_key, 'Rails is omakase');
       equal(payload.my_parent, '2');
@@ -16748,7 +16867,7 @@ define(
         post = env.store.createRecord('post', { title: 'Rails is omakase' });
       });
 
-      var payload = env.container.lookup('serializer:post').serialize(post._createSnapshot());
+      var payload = env.store.serializerFor('post').serialize(post._createSnapshot());
 
       ok(!payload.hasOwnProperty('title'), 'Does not add the key to instance');
       ok(!payload.hasOwnProperty('[object Object]'), 'Does not add some random key like [object Object]');
@@ -16767,7 +16886,7 @@ define(
         comment = env.store.createRecord('comment', { body: 'Omakase is delicious', post: post });
       });
 
-      var serializer = env.container.lookup('serializer:post');
+      var serializer = env.store.serializerFor('post');
       var serializedProperty = serializer.keyForRelationship('comments', 'hasMany');
 
       var payload = serializer.serialize(post._createSnapshot());
@@ -16787,7 +16906,7 @@ define(
         comment = env.store.createRecord('comment', { body: 'Omakase is delicious', post: post });
       });
 
-      var serializer = env.container.lookup('serializer:comment');
+      var serializer = env.store.serializerFor('comment');
       var serializedProperty = serializer.keyForRelationship('post', 'belongsTo');
 
       var payload = serializer.serialize(comment._createSnapshot());
@@ -16807,7 +16926,7 @@ define(
         comment = env.store.createRecord('comment', { body: 'Omakase is delicious', post: post });
       });
 
-      var serializer = env.container.lookup('serializer:post');
+      var serializer = env.store.serializerFor('post');
       var serializedProperty = serializer.keyForRelationship('comments', 'hasMany');
 
       var payload = serializer.serialize(post._createSnapshot());
@@ -16827,7 +16946,7 @@ define(
         comment = env.store.createRecord('comment', { body: 'Omakase is delicious', post: post });
       });
 
-      var serializer = env.container.lookup('serializer:comment');
+      var serializer = env.store.serializerFor('comment');
       var serializedProperty = serializer.keyForRelationship('post', 'belongsTo');
 
       var payload = serializer.serialize(comment._createSnapshot());
@@ -16847,7 +16966,7 @@ define(
         comment = env.store.createRecord('comment', { body: 'Omakase is delicious', post: post });
       });
 
-      var serializer = env.container.lookup('serializer:post');
+      var serializer = env.store.serializerFor('post');
       var serializedProperty = serializer.keyForRelationship('comments', 'hasMany');
 
       var payload = serializer.serialize(post._createSnapshot());
@@ -16867,7 +16986,7 @@ define(
         comment = env.store.createRecord('comment', { body: 'Omakase is delicious', post: post });
       });
 
-      var serializer = env.container.lookup('serializer:comment');
+      var serializer = env.store.serializerFor('comment');
       var serializedProperty = serializer.keyForRelationship('post', 'belongsTo');
 
       var payload = serializer.serialize(comment._createSnapshot());
@@ -16897,7 +17016,7 @@ define(
         post = env.store.createRecord('post', { title: 'Rails is omakase', description: 'Omakase is delicious', anotherString: 'yet another string' });
       });
 
-      var payload = env.container.lookup('serializer:post').serialize(post._createSnapshot());
+      var payload = env.store.serializerFor('post').serialize(post._createSnapshot());
 
       equal(payload.title_payload_key, 'Rails is omakase');
       equal(payload.description_payload_key, 'Omakase is delicious');
@@ -16913,7 +17032,7 @@ define(
       var jsonHash = { '_ID_': 1, title: 'Rails is omakase' };
 
       run(function () {
-        post = env.container.lookup('serializer:post').extractSingle(env.store, Post, jsonHash);
+        post = env.store.serializerFor('post').extractSingle(env.store, Post, jsonHash);
       });
 
       equal(post.id, '1');
@@ -16929,7 +17048,7 @@ define(
         post = env.store.createRecord('post', { id: '1', title: 'Rails is omakase' });
       });
 
-      var payload = env.container.lookup('serializer:post').serialize(post._createSnapshot(), { includeId: true });
+      var payload = env.store.serializerFor('post').serialize(post._createSnapshot(), { includeId: true });
 
       equal(payload._ID_, '1');
     });
@@ -16943,7 +17062,7 @@ define(
 
       var jsonHash = { id: 1, TITLE: 'Rails is omakase' };
 
-      post = env.container.lookup('serializer:post').normalize(Post, jsonHash);
+      post = env.store.serializerFor('post').normalize(Post, jsonHash);
 
       equal(post.id, '1');
       equal(post.title, 'Rails is omakase');
@@ -16958,7 +17077,7 @@ define(
 
       var jsonHash = { id: 1, title: 'Rails is omakase', COMMENTS: ['1'] };
 
-      post = env.container.lookup('serializer:post').normalize(Post, jsonHash);
+      post = env.store.serializerFor('post').normalize(Post, jsonHash);
 
       deepEqual(post.comments, ['1']);
     });
@@ -17006,7 +17125,7 @@ define(
         inHash: DS.attr('string')
       });
 
-      var normalizedPayload = env.container.lookup('serializer:post').normalize(Post, {
+      var normalizedPayload = env.store.serializerFor('post').normalize(Post, {
         id: '1',
         title: 'Ember rocks',
         author: 1,
@@ -17037,7 +17156,7 @@ define(
         favorite = env.store.createRecord('favorite', { post: post, id: '3' });
       });
 
-      env.container.lookup('serializer:favorite').serializeBelongsTo(favorite._createSnapshot(), json, { key: 'post', options: { polymorphic: true, async: true } });
+      env.store.serializerFor('favorite').serializeBelongsTo(favorite._createSnapshot(), json, { key: 'post', options: { polymorphic: true, async: true } });
 
       deepEqual(json, expected, 'returned JSON is correct');
     });
@@ -17053,14 +17172,14 @@ define(
       var payload = {
         errors: [{
           source: { pointer: 'data/attributes/le_title' },
-          details: 'title errors'
+          detail: 'title errors'
         }, {
           source: { pointer: 'data/attributes/my_comments' },
-          details: 'comments errors'
+          detail: 'comments errors'
         }]
       };
 
-      var errors = env.container.lookup('serializer:post').extractErrors(env.store, Post, payload);
+      var errors = env.store.serializerFor('post').extractErrors(env.store, Post, payload);
 
       deepEqual(errors, {
         title: ['title errors'],
@@ -17075,11 +17194,11 @@ define(
         attributeWhichWillBeRemovedinExtractErrors: ['true'],
         errors: [{
           source: { pointer: 'data/attributes/title' },
-          details: 'title errors'
+          detail: 'title errors'
         }]
       };
 
-      var errors = env.container.lookup('serializer:post').extractErrors(env.store, Post, payload);
+      var errors = env.store.serializerFor('post').extractErrors(env.store, Post, payload);
 
       deepEqual(errors, { title: ['title errors'] });
     });
@@ -17091,7 +17210,7 @@ define(
         untouchedSinceNoErrorsSiblingPresent: ['true']
       };
 
-      var errors = env.container.lookup('serializer:post').extractErrors(env.store, Post, payload);
+      var errors = env.store.serializerFor('post').extractErrors(env.store, Post, payload);
 
       deepEqual(errors, { untouchedSinceNoErrorsSiblingPresent: ['true'] });
     });
@@ -19376,15 +19495,15 @@ define(
 
     var errorsArray = [{
       title: "Invalid Attribute",
-      details: "is invalid",
+      detail: "is invalid",
       source: { pointer: "data/attributes/name" }
     }, {
       title: "Invalid Attribute",
-      details: "must be a string",
+      detail: "must be a string",
       source: { pointer: "data/attributes/name" }
     }, {
       title: "Invalid Attribute",
-      details: "must be a number",
+      detail: "must be a number",
       source: { pointer: "data/attributes/age" }
     }];
 
@@ -19407,7 +19526,7 @@ define(
 
       deepEqual(error.errors, [{
         title: "Invalid Attribute",
-        details: "is invalid",
+        detail: "is invalid",
         source: { pointer: "data/attributes/name" }
       }]);
     });
@@ -20150,6 +20269,8 @@ define("ember-data/tests/unit/model-test", ["exports"], function(__exports__) {
     __exports__[name] = value;
   }
 
+  var keysFunc = Object.keys || Ember.keys;
+
   var get = Ember.get;
   var set = Ember.set;
   var run = Ember.run;
@@ -20360,7 +20481,7 @@ define("ember-data/tests/unit/model-test", ["exports"], function(__exports__) {
       mascot = store.push('mascot', { id: 1, likes: 'JavaScript', isMascot: true });
     });
 
-    equal(Ember.keys(mascot.changedAttributes()).length, 0, 'there are no initial changes');
+    equal(keysFunc(mascot.changedAttributes()).length, 0, 'there are no initial changes');
     run(function () {
       mascot.set('name', 'Tomster'); // new value
       mascot.set('likes', 'Ember.js'); // changed value
@@ -20373,7 +20494,7 @@ define("ember-data/tests/unit/model-test", ["exports"], function(__exports__) {
     run(function () {
       mascot.rollbackAttributes();
     });
-    equal(Ember.keys(mascot.changedAttributes()).length, 0, 'after rollback attributes there are no changes');
+    equal(keysFunc(mascot.changedAttributes()).length, 0, 'after rollback attributes there are no changes');
   });
 
   test('a DS.Model does not require an attribute type', function () {
@@ -22826,6 +22947,8 @@ define(
       __exports__[name] = value;
     }
 
+    var keysFunc = Object.keys || Ember.keys;
+
     var env, store, Person, Dog;
     var run = Ember.run;
 
@@ -22932,7 +23055,7 @@ define(
 
           equal(person.get("firstName"), "Tom");
           equal(person.get("isError"), false);
-          equal(Ember.keys(person.changedAttributes()).length, 0);
+          equal(keysFunc(person.changedAttributes()).length, 0);
         });
       });
     });
@@ -25321,6 +25444,8 @@ define(
       __exports__[name] = value;
     }
 
+    var keysFunc = Object.keys || Ember.keys;
+
     var store;
 
     var run = Ember.run;
@@ -25352,7 +25477,7 @@ define(
       expect(7);
 
       function metadataKeys(type) {
-        return Ember.keys(store.metadataFor(type));
+        return keysFunc(store.metadataFor(type));
       }
 
       // Currently not using QUnit.deepEqual due to the way deepEqual
@@ -26965,6 +27090,13 @@ test('ember-data/lib/system/normalize-model-name.js should pass jshint', functio
   ok(true, 'ember-data/lib/system/normalize-model-name.js should pass jshint.'); 
 });
 
+}
+if (!QUnit.urlParams.nojshint) {
+module('JSHint - ember-data/lib/system');
+test('ember-data/lib/system/object-polyfills.js should pass jshint', function() { 
+  ok(true, 'ember-data/lib/system/object-polyfills.js should pass jshint.'); 
+});
+
 }
 if (!QUnit.urlParams.nojshint) {
 module('JSHint - ember-data/lib/system');