Merge branch 'health-check-route'

# Conflicts:
#	db/schema.rb

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/routing/routing_spec.rb b/spec/routing/routing_spec.rb
index 8530a2f31d5..de13c0db5d1 100644
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
@@ -276,3 +276,13 @@ describe "Groups", "routing" do
     expect(get('/1')).to route_to('namespaces#show', id: '1')
   end
 end
+
+describe HealthCheckController, 'routing' do
+  it 'to #index' do
+    expect(get('/health_check')).to route_to('health_check#index')
+  end
+
+  it 'also supports passing checks in the url' do
+    expect(get('/health_check/email')).to route_to('health_check#index', checks: 'email')
+  end
+end