projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '19899-webdav-cache-control' into main. Refs #19899
[arvados.git]
/
services
/
api
/
test
/
integration
/
api_client_authorizations_api_test.rb
diff --git
a/services/api/test/integration/api_client_authorizations_api_test.rb
b/services/api/test/integration/api_client_authorizations_api_test.rb
index a366664e0da12e76f84e48d1f14b6b834afce485..405e4bf687cee646c06e1c22d189802c4039d848 100644
(file)
--- a/
services/api/test/integration/api_client_authorizations_api_test.rb
+++ b/
services/api/test/integration/api_client_authorizations_api_test.rb
@@
-124,7
+124,7
@@
class ApiClientAuthorizationsApiTest < ActionDispatch::IntegrationTest
end
end
end
end
- test "
expires_at can be
set to #{desired_expiration.nil? ? 'nil' : 'exceed the limit'} by admins when API.MaxTokenLifetime is set" do
+ test "
behavior when expires_at is
set to #{desired_expiration.nil? ? 'nil' : 'exceed the limit'} by admins when API.MaxTokenLifetime is set" do
Rails.configuration.API.MaxTokenLifetime = 1.hour
# Test token creation
Rails.configuration.API.MaxTokenLifetime = 1.hour
# Test token creation
@@
-139,15
+139,15
@@
class ApiClientAuthorizationsApiTest < ActionDispatch::IntegrationTest
headers: {'HTTP_AUTHORIZATION' => "OAuth2 #{api_client_authorizations(:admin_trustedclient).api_token}"}
assert_response 200
if desired_expiration.nil?
headers: {'HTTP_AUTHORIZATION' => "OAuth2 #{api_client_authorizations(:admin_trustedclient).api_token}"}
assert_response 200
if desired_expiration.nil?
- assert_equal json_response['expires_at'].to_time.to_i, (db_current_time + Rails.configuration.API.MaxTokenLifetime).to_i
+ # When expires_at is nil, default to MaxTokenLifetime
+ assert_operator (json_response['expires_at'].to_time.to_i - (db_current_time + Rails.configuration.API.MaxTokenLifetime).to_i).abs, :<, 2
else
assert_equal json_response['expires_at'].to_time.to_i, desired_expiration.to_i
end
# Test token update (reverse the above behavior)
else
assert_equal json_response['expires_at'].to_time.to_i, desired_expiration.to_i
end
# Test token update (reverse the above behavior)
- previous_expiration = json_response['expires_at']
token_uuid = json_response['uuid']
token_uuid = json_response['uuid']
- if
previous
_expiration.nil?
+ if
desired
_expiration.nil?
submitted_updated_expiration = db_current_time + Rails.configuration.API.MaxTokenLifetime + 1.hour
else
submitted_updated_expiration = nil
submitted_updated_expiration = db_current_time + Rails.configuration.API.MaxTokenLifetime + 1.hour
else
submitted_updated_expiration = nil
@@
-161,7
+161,7
@@
class ApiClientAuthorizationsApiTest < ActionDispatch::IntegrationTest
headers: {'HTTP_AUTHORIZATION' => "OAuth2 #{api_client_authorizations(:admin_trustedclient).api_token}"}
assert_response 200
if submitted_updated_expiration.nil?
headers: {'HTTP_AUTHORIZATION' => "OAuth2 #{api_client_authorizations(:admin_trustedclient).api_token}"}
assert_response 200
if submitted_updated_expiration.nil?
- assert_
equal json_response['expires_at'].to_time.to_i, (db_current_time + Rails.configuration.API.MaxTokenLifetime).to_i
+ assert_
operator (json_response['expires_at'].to_time.to_i - (db_current_time + Rails.configuration.API.MaxTokenLifetime).to_i).abs, :<, 2
else
assert_equal json_response['expires_at'].to_time.to_i, submitted_updated_expiration.to_i
end
else
assert_equal json_response['expires_at'].to_time.to_i, submitted_updated_expiration.to_i
end