diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-28 16:21:45 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-28 16:21:45 +0300 |
| commit | 31b87b8cab2c2daebb99657046e5d121b48499ad (patch) | |
| tree | 4901b71ad54a369deacbffcc43b85ea2fe6c7dd2 /config | |
| parent | 0f0517d727ff9f7fac911f88b6d6619cffe262d7 (diff) | |
| parent | 3532b8db712d1d6daa0a656b0fde317af9b8ae53 (diff) | |
Merge branch 'grpc-fork-tests' into 'master'
Unicorn worker termination tests
See merge request !10818
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 2 | ||||
| -rw-r--r-- | config/routes/test.rb | 2 |
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' |