Merge branch 'release/0.20'0.20.0.0

Conflicts:
  config/general.yml-example

1 files changed, 15 insertions, 0 deletions

diff --git a/spec/helpers/health_checks_helper_spec.rb b/spec/helpers/health_checks_helper_spec.rb
new file mode 100644
index 000000000..7d4083da5
--- /dev/null
+++ b/spec/helpers/health_checks_helper_spec.rb
@@ -0,0 +1,15 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe HealthChecksHelper do
+    include HealthChecksHelper
+
+    describe :check_status do
+
+        it 'warns that the check is failing' do
+            check = double(:message => 'Failed', :ok? => false)
+            expect(check_status(check)).to include('red')
+        end
+
+    end
+
+end