X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c436da861845723ab18f56dba96052cf2569e539..12dd86319a1c6fb88fbe1530dc59e6172d448337:/services/api/test/test_helper.rb diff --git a/services/api/test/test_helper.rb b/services/api/test/test_helper.rb index 1bd1b51263..caf3e09ea3 100644 --- a/services/api/test/test_helper.rb +++ b/services/api/test/test_helper.rb @@ -1,4 +1,25 @@ 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' @@ -17,10 +38,6 @@ 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 fixtures :all include ArvadosTestSupport @@ -31,6 +48,19 @@ 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