Merge branch '14009-container-reuse-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 6c330dd2de2666327110681d849074c7cb50e46e..6dbaa7550f55a8e49b035e6092c331304c6e4edb 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
-    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
 
@@ -145,10 +152,6 @@ class ActionController::TestCase
     @test_counter = 0
   end
 
-  teardown do
-    User.invalidate_permissions_cache
-  end
-
   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
-    User.invalidate_permissions_cache
   end
 end