Merge branch 'release/0.20'0.20.0.0

Conflicts:
  config/general.yml-example

1 files changed, 30 insertions, 0 deletions

diff --git a/spec/controllers/health_checks_controller_spec.rb b/spec/controllers/health_checks_controller_spec.rb
new file mode 100644
index 000000000..f7ad6d6a4
--- /dev/null
+++ b/spec/controllers/health_checks_controller_spec.rb
@@ -0,0 +1,30 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe HealthChecksController do
+
+    describe :index do
+
+        describe :index do
+
+            it 'returns a 200 if all health checks pass' do
+                HealthChecks.stub(:ok? => true)
+                get :index
+                expect(response.status).to eq(200)
+            end
+
+            it 'returns a 500 if the health check fails' do
+                HealthChecks.stub(:ok? => false)
+                get :index
+                expect(response.status).to eq(500)
+            end
+
+            it 'does not render a layout' do
+                 get :index
+                 expect(response).to render_template(:layout => false) 
+            end
+
+        end
+
+    end
+
+end