X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/34173202861e94dee58ccd5b189983918813d870..f5588e5c01baf3084ad42d8be506c4698b1affce:/services/api/test/test_helper.rb diff --git a/services/api/test/test_helper.rb b/services/api/test/test_helper.rb index 72edfad17f..216dd2d02d 100644 --- a/services/api/test/test_helper.rb +++ b/services/api/test/test_helper.rb @@ -49,6 +49,10 @@ class ActiveSupport::TestCase Thread.current[:api_client_uuid] = nil Thread.current[:api_client] = nil Thread.current[:user] = nil + restore_configuration + end + + def restore_configuration # Restore configuration settings changed during tests $application_config.each do |k,v| if k.match /^[^.]*$/ @@ -80,6 +84,26 @@ class ActiveSupport::TestCase end end +class ActionController::TestCase + setup do + @counter = 0 + end + + def check_counter action + @counter += 1 + if @counter == 2 + assert_equal 1, 2, "Multiple actions in functional test" + end + end + + [:get, :post, :put, :patch, :delete].each do |method| + define_method method do |action, *args| + check_counter action + super action, *args + end + end +end + class ActionDispatch::IntegrationTest teardown do Thread.current[:api_client_ip_address] = nil