projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
12840: Differentiate "Cancelled" from "Failed" pipeline instances.
[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 6c330dd2de2666327110681d849074c7cb50e46e..c834250cb6caa89c28ff25ad942978dd14399949 100644
(file)
--- a/
services/api/test/test_helper.rb
+++ b/
services/api/test/test_helper.rb
@@
-67,7
+67,6
@@
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)
end
def assert_equal(expect, *args)
@@
-128,6
+127,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
@@
-145,10
+152,6
@@
class ActionController::TestCase
@test_counter = 0
end
@test_counter = 0
end
- teardown do
- User.invalidate_permissions_cache
- end
-
def check_counter action
@test_counter += 1
if @test_counter == 2
def check_counter action
@test_counter += 1
if @test_counter == 2
@@
-186,7
+189,6
@@
class ActionDispatch::IntegrationTest
Thread.current[:api_client_uuid] = nil
Thread.current[:api_client] = nil
Thread.current[:user] = nil
Thread.current[:api_client_uuid] = nil
Thread.current[:api_client] = nil
Thread.current[:user] = nil
- User.invalidate_permissions_cache
end
end
end
end