projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
13561: Add basic support for collection versioning at the model level.
[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 a614aa6e69fcae8db84745734d99e7e5d99823ad..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
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
@@
-136,7
+143,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