Throw a more helpful error message if the response from queryRecord i…

…s empty
emberjs · Oct 16, 2015 · 9b247d2 · 9b247d2
1 parent 921e8c9
commit 9b247d2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/packages/ember-data/lib/system/store/finders.js b/packages/ember-data/lib/system/store/finders.js
@@ -175,6 +175,7 @@ export function _queryRecord(adapter, store, typeClass, query) {
     var record;
     store._adapterRun(function() {
       var payload = normalizeResponseHelper(serializer, store, typeClass, adapterPayload, null, 'queryRecord');
+      Ember.assert('`store.queryRecord` expected the adapter to return one record but the response from the adapter was empty.', payload.data);
       //TODO Optimize
       record = store.push(payload);
     });

diff --git a/packages/ember-data/tests/integration/adapter/rest-adapter-test.js b/packages/ember-data/tests/integration/adapter/rest-adapter-test.js
@@ -1318,6 +1318,18 @@ test("queryRecord - returning an array picks the first one but saves all records
   }));
 });
 
+test("queryRecord - returning an empty array errors", function() {
+  ajaxResponse({
+    post: []
+  });
+
+  expectAssertion(function() {
+    Ember.run(function() {
+      store.queryRecord('post', { slug: 'rails-is-omakaze' });
+    });
+  }, /`store.queryRecord` expected the adapter to return one record/);
+});
+
 test("queryRecord - data is normalized through custom serializers", function() {
   env.registry.register('serializer:post', DS.RESTSerializer.extend({
     primaryKey: '_ID_',