projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
7475: Merge branch 'master' into 7475-nodemgr-unsatisfiable-job-comms
[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 d998c92cadf85cd5dc80364e15a88611b7f5346c..a614aa6e69fcae8db84745734d99e7e5d99823ad 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,11
+31,9
@@
unless ENV["NO_COVERAGE_TEST"]
end
require File.expand_path('../../config/environment', __FILE__)
end
require File.expand_path('../../config/environment', __FILE__)
-gem 'minitest'
require 'rails/test_help'
require 'rails/test_help'
-require 'minitest-rails'
-require 'minitest/autorun'
require 'mocha'
require 'mocha'
+require 'mocha/mini_test'
module ArvadosTestSupport
def json_response
module ArvadosTestSupport
def json_response
@@
-52,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
@@
-63,6
+67,15
@@
class ActiveSupport::TestCase
Thread.current[:api_client] = nil
Thread.current[:user] = nil
restore_configuration
Thread.current[:api_client] = nil
Thread.current[:user] = nil
restore_configuration
+ User.invalidate_permissions_cache
+ end
+
+ def assert_equal(expect, *args)
+ if expect.nil?
+ assert_nil(*args)
+ else
+ super
+ end
end
def assert_not_allowed
end
def assert_not_allowed
@@
-87,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
@@
-125,8
+138,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