X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0f644e242ef37c911ad3dc25aca8135c339de349..8fdac0b6f954b6265798390b95e61f8192b85630:/services/api/test/test_helper.rb diff --git a/services/api/test/test_helper.rb b/services/api/test/test_helper.rb index a614aa6e69..6dbaa7550f 100644 --- 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 - User.invalidate_permissions_cache end def assert_equal(expect, *args) @@ -128,6 +127,14 @@ class ActiveSupport::TestCase "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 @@ -136,7 +143,7 @@ class ActiveSupport::TestCase end def self.slow_test(name, &block) - define_method(name, block) unless skip_slow_tests? + test(name, &block) unless skip_slow_tests? end end