projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14484: Moves test for grouping pdhs to its own file
[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 639b53bfa717f1a89a5a30cadeaf7ea7eee7fe3f..ffd50d808072887884caabffab08252aa2d71716 100644
(file)
--- a/
services/api/test/test_helper.rb
+++ b/
services/api/test/test_helper.rb
@@
-33,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
@@
-41,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
@@
-54,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
@@
-65,6
+65,7
@@
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
end
Thread.current[:user] = nil
restore_configuration
end
@@
-110,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
@@
-117,22
+119,22
@@
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 salt_token(fixture:, remote
_id
:)
+ def salt_token(fixture:, remote:)
auth = api_client_authorizations(fixture)
uuid = auth.uuid
token = auth.api_token
auth = api_client_authorizations(fixture)
uuid = auth.uuid
token = auth.api_token
- hmac = OpenSSL::HMAC.hexdigest('sha1', token, remote
_id
)
- return "v2
,#{uuid},
#{hmac}"
+ hmac = OpenSSL::HMAC.hexdigest('sha1', token, remote)
+ return "v2
/#{uuid}/
#{hmac}"
end
def self.skip_slow_tests?
end
def self.skip_slow_tests?
@@
-143,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
@@
-188,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