projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '14988-wb-rails5-upgrade'
[arvados.git]
/
services
/
api
/
test
/
integration
/
remote_user_test.rb
diff --git
a/services/api/test/integration/remote_user_test.rb
b/services/api/test/integration/remote_user_test.rb
index 5c09cf1bcc6e274eb713b2cf7988263d53020790..90a55865397cefb6ce7e0829eca626a21734c2fc 100644
(file)
--- a/
services/api/test/integration/remote_user_test.rb
+++ b/
services/api/test/integration/remote_user_test.rb
@@
-63,8
+63,8
@@
class RemoteUsersTest < ActionDispatch::IntegrationTest
ready.pop
@remote_server = srv
@remote_host = "127.0.0.1:#{srv.config[:Port]}"
ready.pop
@remote_server = srv
@remote_host = "127.0.0.1:#{srv.config[:Port]}"
- Rails.configuration.
remote_hosts = Rails.configuration.remote_hosts.merge({'zbbbb' => @remote_host
,
-
'zbork' => @remote_host
})
+ Rails.configuration.
RemoteClusters = Rails.configuration.RemoteClusters.merge({zbbbb: ActiveSupport::InheritableOptions.new({Host: @remote_host})
,
+
zbork: ActiveSupport::InheritableOptions.new({Host: @remote_host})
})
Arvados::V1::SchemaController.any_instance.stubs(:root_url).returns "https://#{@remote_host}"
@stub_status = 200
@stub_content = {
Arvados::V1::SchemaController.any_instance.stubs(:root_url).returns "https://#{@remote_host}"
@stub_status = 200
@stub_content = {
@@
-243,7
+243,7
@@
class RemoteUsersTest < ActionDispatch::IntegrationTest
end
test 'auto-activate user from trusted cluster' do
end
test 'auto-activate user from trusted cluster' do
- Rails.configuration.
auto_activate_users_from = ['zbbbb']
+ Rails.configuration.
RemoteClusters['zbbbb'].ActivateUsers = true
get '/arvados/v1/users/current',
params: {format: 'json'},
headers: auth(remote: 'zbbbb')
get '/arvados/v1/users/current',
params: {format: 'json'},
headers: auth(remote: 'zbbbb')