Merge branch '5626-git-server-hostname' into 4752-docker-websockets

[arvados.git] / services / api / test / functional / database_controller_test.rb

diff --git a/services/api/test/functional/database_controller_test.rb b/services/api/test/functional/database_controller_test.rb
index 56662ee4373988f13a2d81c3806a5e6ea7bf40f2..4bda0d0f116ee5801003329d752cc241316a25f1 100644 (file)
--- a/services/api/test/functional/database_controller_test.rb
+++ b/services/api/test/functional/database_controller_test.rb
@@ -12,11 +12,10 @@ class DatabaseControllerTest < ActionController::TestCase
   test "route not found when not in test mode" do
     authorize_with :admin
     env_was = Rails.env
-    Rails.application.reload_routes!
     begin
+      Rails.env = 'production'
+      Rails.application.reload_routes!
       assert_raises ActionController::RoutingError do
-        Rails.env = 'production'
-        Rails.application.reload_routes!
         post :reset
       end
     ensure