projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '14274-factory-bot' closes #14274
[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 38f44c5d9b54ed4557bdfbf9be8c8376146357b9..40e801e013ab39d047c1e027693d0a00721a2b12 100644
(file)
--- a/
services/api/test/test_helper.rb
+++ b/
services/api/test/test_helper.rb
@@
-1,3
+1,7
@@
+# 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
@@
-29,7
+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'
+require 'mocha/minitest'
module ArvadosTestSupport
def json_response
module ArvadosTestSupport
def json_response
@@
-50,7
+54,7
@@
module ArvadosTestSupport
end
class ActiveSupport::TestCase
end
class ActiveSupport::TestCase
- include Factory
Girl
::Syntax::Methods
+ include Factory
Bot
::Syntax::Methods
fixtures :all
include ArvadosTestSupport
fixtures :all
include ArvadosTestSupport
@@
-61,9
+65,9
@@
class ActiveSupport::TestCase
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
restore_configuration
Thread.current[:user] = nil
restore_configuration
- User.invalidate_permissions_cache
end
def assert_equal(expect, *args)
end
def assert_equal(expect, *args)
@@
-107,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
@@
-124,6
+129,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
@@
-132,7
+145,7
@@
class ActiveSupport::TestCase
end
def self.slow_test(name, &block)
end
def self.slow_test(name, &block)
-
define_method(name,
block) unless skip_slow_tests?
+
test(name, &
block) unless skip_slow_tests?
end
end
end
end
@@
-177,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