projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
api: Support filters in API client auths index.
[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 a81bfdf9e40c1bb03af90a274a1fe68645c534b0..286cf66f28f240f00ea9aaf98bbb0ce5c13e7b8e 100644
(file)
--- a/
services/api/test/test_helper.rb
+++ b/
services/api/test/test_helper.rb
@@
-9,10
+9,22
@@
class ActiveSupport::TestCase
# -- they do not yet inherit this setting
fixtures :all
# -- they do not yet inherit this setting
fixtures :all
+ teardown do
+ Thread.current[:api_client_ip_address] = nil
+ Thread.current[:api_client_authorization] = nil
+ Thread.current[:api_client_uuid] = nil
+ Thread.current[:api_client] = nil
+ Thread.current[:user] = nil
+ end
+
def expect_json
self.request.headers["Accept"] = "text/json"
end
def expect_json
self.request.headers["Accept"] = "text/json"
end
+ def json_response
+ @json_response ||= ActiveSupport::JSON.decode @response.body
+ end
+
def authorize_with(api_client_auth_name)
self.request.env['HTTP_AUTHORIZATION'] = "OAuth2 #{api_client_authorizations(api_client_auth_name).api_token}"
end
def authorize_with(api_client_auth_name)
self.request.env['HTTP_AUTHORIZATION'] = "OAuth2 #{api_client_authorizations(api_client_auth_name).api_token}"
end
@@
-21,9
+33,15
@@
class ActiveSupport::TestCase
end
class ActionDispatch::IntegrationTest
end
class ActionDispatch::IntegrationTest
- def jresponse
- @jresponse ||= ActiveSupport::JSON.decode @response.body
+
+ teardown do
+ Thread.current[:api_client_ip_address] = nil
+ Thread.current[:api_client_authorization] = nil
+ Thread.current[:api_client_uuid] = nil
+ Thread.current[:api_client] = nil
+ Thread.current[:user] = nil
end
end
+
def auth auth_fixture
{'HTTP_AUTHORIZATION' => "OAuth2 #{api_client_authorizations(auth_fixture).api_token}"}
end
def auth auth_fixture
{'HTTP_AUTHORIZATION' => "OAuth2 #{api_client_authorizations(auth_fixture).api_token}"}
end