projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14484: Simplifies pdh transaction grouping, keeps SQL in the migration
[arvados.git]
/
services
/
api
/
test
/
test_helper.rb
diff --git
a/services/api/test/test_helper.rb
b/services/api/test/test_helper.rb
index 2986f697e66f78145ad09e00a7d66be9297735da..ffd50d808072887884caabffab08252aa2d71716 100644
(file)
--- a/
services/api/test/test_helper.rb
+++ b/
services/api/test/test_helper.rb
@@
-1,8
+1,18
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
ENV["RAILS_ENV"] = "test"
unless ENV["NO_COVERAGE_TEST"]
begin
ENV["RAILS_ENV"] = "test"
unless ENV["NO_COVERAGE_TEST"]
begin
- require 'simplecov'
- require 'simplecov-rcov'
+ verbose_orig = $VERBOSE
+ begin
+ $VERBOSE = nil
+ require 'simplecov'
+ require 'simplecov-rcov'
+ ensure
+ $VERBOSE = verbose_orig
+ end
class SimpleCov::Formatter::MergedFormatter
def format(result)
SimpleCov::Formatter::HTMLFormatter.new.format(result)
class SimpleCov::Formatter::MergedFormatter
def format(result)
SimpleCov::Formatter::HTMLFormatter.new.format(result)
@@
-21,9
+31,9
@@
unless ENV["NO_COVERAGE_TEST"]
end
require File.expand_path('../../config/environment', __FILE__)
end
require File.expand_path('../../config/environment', __FILE__)
-require 'test/unit/active_support'
require 'rails/test_help'
require 'rails/test_help'
-require 'mocha/test_unit'
+require 'mocha'
+require 'mocha/minitest'
module ArvadosTestSupport
def json_response
module ArvadosTestSupport
def json_response
@@
-31,11
+41,11
@@
module ArvadosTestSupport
end
def api_token(api_client_auth_name)
end
def api_token(api_client_auth_name)
- api_client_authorizations(api_client_auth_name).
api_
token
+ api_client_authorizations(api_client_auth_name).token
end
def auth(api_client_auth_name)
end
def auth(api_client_auth_name)
- {'HTTP_AUTHORIZATION' => "
OAuth2
#{api_token(api_client_auth_name)}"}
+ {'HTTP_AUTHORIZATION' => "
Bearer
#{api_token(api_client_auth_name)}"}
end
def show_errors model
end
def show_errors model
@@
-44,25
+54,30
@@
module ArvadosTestSupport
end
class ActiveSupport::TestCase
end
class ActiveSupport::TestCase
- include Factory
Girl
::Syntax::Methods
+ include Factory
Bot
::Syntax::Methods
fixtures :all
include ArvadosTestSupport
include CurrentApiClient
fixtures :all
include ArvadosTestSupport
include CurrentApiClient
- setup do
- Rails.logger.warn "\n\n#{'=' * 70}\n#{self.class}\##{method_name}\n#{'-' * 70}\n\n"
- end
-
teardown do
Thread.current[:api_client_ip_address] = nil
Thread.current[:api_client_authorization] = nil
Thread.current[:api_client_uuid] = nil
Thread.current[:api_client] = nil
teardown do
Thread.current[:api_client_ip_address] = nil
Thread.current[:api_client_authorization] = nil
Thread.current[:api_client_uuid] = nil
Thread.current[:api_client] = nil
+ Thread.current[:token] = nil
Thread.current[:user] = nil
restore_configuration
end
Thread.current[:user] = nil
restore_configuration
end
+ def assert_equal(expect, *args)
+ if expect.nil?
+ assert_nil(*args)
+ else
+ super
+ end
+ end
+
def assert_not_allowed
# Provide a block that calls a Rails boolean "true or false" success value,
# like model.save or model.destroy. This method will test that it either
def assert_not_allowed
# Provide a block that calls a Rails boolean "true or false" success value,
# like model.save or model.destroy. This method will test that it either
@@
-85,7
+100,7
@@
class ActiveSupport::TestCase
def restore_configuration
# Restore configuration settings changed during tests
$application_config.each do |k,v|
def restore_configuration
# Restore configuration settings changed during tests
$application_config.each do |k,v|
- if k.match
/^[^.]*$/
+ if k.match
(/^[^.]*$/)
Rails.configuration.send (k + '='), v
end
end
Rails.configuration.send (k + '='), v
end
end
@@
-96,6
+111,7
@@
class ActiveSupport::TestCase
Thread.current[:api_client_authorization] = client_auth
Thread.current[:api_client] = client_auth.api_client
Thread.current[:user] = client_auth.user
Thread.current[:api_client_authorization] = client_auth
Thread.current[:api_client] = client_auth.api_client
Thread.current[:user] = client_auth.user
+ Thread.current[:token] = client_auth.token
end
def expect_json
end
def expect_json
@@
-103,23
+119,34
@@
class ActiveSupport::TestCase
end
def authorize_with api_client_auth_name
end
def authorize_with api_client_auth_name
- authorize_with_token api_client_authorizations(api_client_auth_name).
api_
token
+ authorize_with_token api_client_authorizations(api_client_auth_name).token
end
def authorize_with_token token
t = token
end
def authorize_with_token token
t = token
- t = t.
api_token if t.respond_to? :api_
token
+ t = t.
token if t.respond_to? :
token
ArvadosApiToken.new.call("rack.input" => "",
ArvadosApiToken.new.call("rack.input" => "",
- "HTTP_AUTHORIZATION" => "
OAuth2
#{t}")
+ "HTTP_AUTHORIZATION" => "
Bearer
#{t}")
end
end
- def slow_test
- omit "RAILS_TEST_SHORT is set" if self.class.skip_slow_tests?
+ def salt_token(fixture:, remote:)
+ auth = api_client_authorizations(fixture)
+ uuid = auth.uuid
+ token = auth.api_token
+ hmac = OpenSSL::HMAC.hexdigest('sha1', token, remote)
+ return "v2/#{uuid}/#{hmac}"
end
def self.skip_slow_tests?
!(ENV['RAILS_TEST_SHORT'] || '').empty?
end
end
def self.skip_slow_tests?
!(ENV['RAILS_TEST_SHORT'] || '').empty?
end
+
+ def self.skip(*args, &block)
+ end
+
+ def self.slow_test(name, &block)
+ test(name, &block) unless skip_slow_tests?
+ end
end
class ActionController::TestCase
end
class ActionController::TestCase
@@
-163,6
+190,7
@@
class ActionDispatch::IntegrationTest
Thread.current[:api_client_authorization] = nil
Thread.current[:api_client_uuid] = nil
Thread.current[:api_client] = nil
Thread.current[:api_client_authorization] = nil
Thread.current[:api_client_uuid] = nil
Thread.current[:api_client] = nil
+ Thread.current[:token] = nil
Thread.current[:user] = nil
end
end
Thread.current[:user] = nil
end
end