From 617d3440f03204bf92c179dd964e8ce49563048d Mon Sep 17 00:00:00 2001
From: Rufus Pollock <rufus.pollock@okfn.org>
Date: Fri, 15 Jun 2012 22:32:18 +0100
Subject: [PATCH] [#154, backend/elasticsearch][s]: backend errors now reported
 up the stack (implement deferred reject when call to backend fails).

---
 src/backend/elasticsearch.js       | 6 ++++++
 test/backend/elasticsearch.test.js | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/backend/elasticsearch.js b/src/backend/elasticsearch.js
index bcab5d95..bee8d9ba 100644
--- a/src/backend/elasticsearch.js
+++ b/src/backend/elasticsearch.js
@@ -213,6 +213,12 @@ this.recline.Backend.ElasticSearch = this.recline.Backend.ElasticSearch || {};
           results.hits.facets = results.facets;
         }
         dfd.resolve(results.hits);
+      }).fail(function(errorObj) {
+        var out = {
+          title: 'Failed: ' + errorObj.status + ' code',
+          message: errorObj.responseText
+        };
+        dfd.reject(out);
       });
       return dfd.promise();
     };
diff --git a/test/backend/elasticsearch.test.js b/test/backend/elasticsearch.test.js
index 0c08607f..91affe18 100644
--- a/test/backend/elasticsearch.test.js
+++ b/test/backend/elasticsearch.test.js
@@ -128,6 +128,7 @@ test("query", function() {
       return {
         done: function(callback) {
           callback(sample_data);
+          return this;
         },
         fail: function() {
         }
@@ -224,10 +225,11 @@ test("query", function() {
       return {
         done: function(callback) {
           callback(sample_data);
+          return this;
         },
         fail: function() {
         }
-      }
+      };
     }
   });