projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '8784-dir-listings'
[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 bf5afea1e2dd6b44fa68332df4c1f1512855a472..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)
@@
-22,10
+32,12
@@
end
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'
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
- Oj.load response.body
+ Oj.
strict_
load response.body
end
def api_token(api_client_auth_name)
end
def api_token(api_client_auth_name)
@@
-35,6
+47,10
@@
module ArvadosTestSupport
def auth(api_client_auth_name)
{'HTTP_AUTHORIZATION' => "OAuth2 #{api_token(api_client_auth_name)}"}
end
def auth(api_client_auth_name)
{'HTTP_AUTHORIZATION' => "OAuth2 #{api_token(api_client_auth_name)}"}
end
+
+ def show_errors model
+ return lambda { model.errors.full_messages.inspect }
+ end
end
class ActiveSupport::TestCase
end
class ActiveSupport::TestCase
@@
-42,6
+58,7
@@
class ActiveSupport::TestCase
fixtures :all
include ArvadosTestSupport
fixtures :all
include ArvadosTestSupport
+ include CurrentApiClient
teardown do
Thread.current[:api_client_ip_address] = nil
teardown do
Thread.current[:api_client_ip_address] = nil
@@
-50,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
@@
-74,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
@@
-101,16
+127,27
@@
class ActiveSupport::TestCase
ArvadosApiToken.new.call("rack.input" => "",
"HTTP_AUTHORIZATION" => "OAuth2 #{t}")
end
ArvadosApiToken.new.call("rack.input" => "",
"HTTP_AUTHORIZATION" => "OAuth2 #{t}")
end
+
+ def self.skip_slow_tests?
+ !(ENV['RAILS_TEST_SHORT'] || '').empty?
+ end
+
+ def self.skip(*args, &block)
+ end
+
+ def self.slow_test(name, &block)
+ define_method(name, block) unless skip_slow_tests?
+ end
end
class ActionController::TestCase
setup do
end
class ActionController::TestCase
setup do
- @counter = 0
+ @
test_
counter = 0
end
def check_counter action
end
def check_counter action
- @counter += 1
- if @counter == 2
+ @
test_
counter += 1
+ if @
test_
counter == 2
assert_equal 1, 2, "Multiple actions in functional test"
end
end
assert_equal 1, 2, "Multiple actions in functional test"
end
end
@@
-121,6
+158,21
@@
class ActionController::TestCase
super action, *args
end
end
super action, *args
end
end
+
+ def self.suite
+ s = super
+ def s.run(*args)
+ @test_case.startup()
+ begin
+ super
+ ensure
+ @test_case.shutdown()
+ end
+ end
+ s
+ end
+ def self.startup; end
+ def self.shutdown; end
end
class ActionDispatch::IntegrationTest
end
class ActionDispatch::IntegrationTest