X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/943feeec776bb75c685cbdee9466f8db3cdf5da7..9624ed0931aac929f0d773dfee8b9e620b9352ad:/services/api/test/test_helper.rb diff --git a/services/api/test/test_helper.rb b/services/api/test/test_helper.rb index 70988ad108..47c6b613c2 100644 --- a/services/api/test/test_helper.rb +++ b/services/api/test/test_helper.rb @@ -1,14 +1,47 @@ ENV["RAILS_ENV"] = "test" +unless ENV["NO_COVERAGE_TEST"] + begin + require 'simplecov' + require 'simplecov-rcov' + class SimpleCov::Formatter::MergedFormatter + def format(result) + SimpleCov::Formatter::HTMLFormatter.new.format(result) + SimpleCov::Formatter::RcovFormatter.new.format(result) + end + end + SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter + SimpleCov.start do + add_filter '/test/' + add_filter 'initializers/secret_token' + add_filter 'initializers/omniauth' + end + rescue Exception => e + $stderr.puts "SimpleCov unavailable (#{e}). Proceeding without." + end +end + require File.expand_path('../../config/environment', __FILE__) require 'rails/test_help' +module ArvadosTestSupport + def json_response + ActiveSupport::JSON.decode @response.body + end + + def api_token(api_client_auth_name) + api_client_authorizations(api_client_auth_name).api_token + end + + def auth(api_client_auth_name) + {'HTTP_AUTHORIZATION' => "OAuth2 #{api_token(api_client_auth_name)}"} + end +end + class ActiveSupport::TestCase - # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order. - # - # Note: You'll currently still have to declare fixtures explicitly in integration tests - # -- they do not yet inherit this setting fixtures :all + include ArvadosTestSupport + teardown do Thread.current[:api_client_ip_address] = nil Thread.current[:api_client_authorization] = nil @@ -17,23 +50,23 @@ class ActiveSupport::TestCase Thread.current[:user] = nil end - def expect_json - self.request.headers["Accept"] = "text/json" + def set_user_from_auth(auth_name) + client_auth = api_client_authorizations(auth_name) + Thread.current[:api_client_authorization] = client_auth + Thread.current[:api_client] = client_auth.api_client + Thread.current[:user] = client_auth.user end - def json_response - @json_response ||= ActiveSupport::JSON.decode @response.body + def expect_json + self.request.headers["Accept"] = "text/json" end def authorize_with(api_client_auth_name) ArvadosApiToken.new.call ({"rack.input" => "", "HTTP_AUTHORIZATION" => "OAuth2 #{api_client_authorizations(api_client_auth_name).api_token}"}) end - - # Add more helper methods to be used by all tests here... end class ActionDispatch::IntegrationTest - teardown do Thread.current[:api_client_ip_address] = nil Thread.current[:api_client_authorization] = nil @@ -41,10 +74,6 @@ class ActionDispatch::IntegrationTest Thread.current[:api_client] = nil Thread.current[:user] = nil end - - def auth auth_fixture - {'HTTP_AUTHORIZATION' => "OAuth2 #{api_client_authorizations(auth_fixture).api_token}"} - end end # Ensure permissions are computed from the test fixtures.