X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4fb767326911e01898e5ae28a55a1491b9535b36..c6378b0e7da030652334366c8459ff3853811529:/services/api/test/test_helper.rb diff --git a/services/api/test/test_helper.rb b/services/api/test/test_helper.rb index 3e81ff7432..72edfad17f 100644 --- a/services/api/test/test_helper.rb +++ b/services/api/test/test_helper.rb @@ -1,10 +1,31 @@ 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 - @json_response ||= ActiveSupport::JSON.decode @response.body + ActiveSupport::JSON.decode @response.body end def api_token(api_client_auth_name) @@ -17,10 +38,7 @@ module ArvadosTestSupport 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 + include FactoryGirl::Syntax::Methods fixtures :all include ArvadosTestSupport @@ -31,14 +49,34 @@ class ActiveSupport::TestCase Thread.current[:api_client_uuid] = nil Thread.current[:api_client] = nil Thread.current[:user] = nil + # Restore configuration settings changed during tests + $application_config.each do |k,v| + if k.match /^[^.]*$/ + Rails.configuration.send (k + '='), v + end + end + end + + 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 expect_json self.request.headers["Accept"] = "text/json" end - def authorize_with(api_client_auth_name) - self.request.env['HTTP_AUTHORIZATION'] = "OAuth2 #{api_token(api_client_auth_name)}" + def authorize_with api_client_auth_name + authorize_with_token api_client_authorizations(api_client_auth_name).api_token + end + + def authorize_with_token token + t = token + t = t.api_token if t.respond_to? :api_token + ArvadosApiToken.new.call("rack.input" => "", + "HTTP_AUTHORIZATION" => "OAuth2 #{t}") end end