projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
13558: add req_id as a tag to Rails.logger
[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 86bc2397c5309e98310f659d4077d7d0f8a33184..c834250cb6caa89c28ff25ad942978dd14399949 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)
@@
-23,6
+33,7
@@
end
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'
require 'mocha'
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'
require 'mocha'
+require 'mocha/mini_test'
module ArvadosTestSupport
def json_response
module ArvadosTestSupport
def json_response
@@
-49,10
+60,6
@@
class ActiveSupport::TestCase
include ArvadosTestSupport
include CurrentApiClient
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
teardown do
Thread.current[:api_client_ip_address] = nil
Thread.current[:api_client_authorization] = nil
@@
-62,6
+69,14
@@
class ActiveSupport::TestCase
restore_configuration
end
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
@@
-112,6
+127,14
@@
class ActiveSupport::TestCase
"HTTP_AUTHORIZATION" => "OAuth2 #{t}")
end
"HTTP_AUTHORIZATION" => "OAuth2 #{t}")
end
+ 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
def self.skip_slow_tests?
!(ENV['RAILS_TEST_SHORT'] || '').empty?
end
@@
-122,8
+145,6
@@
class ActiveSupport::TestCase
def self.slow_test(name, &block)
define_method(name, block) unless skip_slow_tests?
end
def self.slow_test(name, &block)
define_method(name, block) unless skip_slow_tests?
end
-
- alias_method :skip, :omit
end
class ActionController::TestCase
end
class ActionController::TestCase