summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-04-20 14:51:38 +0200
committerJacob Vosmaer <jacob@gitlab.com>2017-04-26 16:39:12 +0200
commitb325d4a658bd884d2d10b832032296e9e28bcc24 (patch)
tree3cee11210c8f7a8e534df247e77049719ffbfe50 /config
parenta9da37434af6d44c5f851affd4bd69b370760e8e (diff)
downloadgitlab-ce-b325d4a658bd884d2d10b832032296e9e28bcc24.tar.gz
Add test that asserts unicorns terminate
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb2
-rw-r--r--config/routes/test.rb2
2 files changed, 4 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 1da226a3b57..2584981bb04 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -99,5 +99,7 @@ Rails.application.routes.draw do
end
end
+ draw :test if Rails.env.test?
+
get '*unmatched_route', to: 'application#route_not_found'
end
diff --git a/config/routes/test.rb b/config/routes/test.rb
new file mode 100644
index 00000000000..ac477cdbbbc
--- /dev/null
+++ b/config/routes/test.rb
@@ -0,0 +1,2 @@
+get '/unicorn_test/pid' => 'unicorn_test#pid'
+post '/unicorn_test/kill' => 'unicorn_test#kill'