projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3036-collection-uuids
[arvados.git]
/
services
/
api
/
test
/
integration
/
keep_proxy_test.rb
diff --git
a/services/api/test/integration/keep_proxy_test.rb
b/services/api/test/integration/keep_proxy_test.rb
index 130b2527abaa396e485f31ad09ae7fe8969ddc88..d4155c2c4a6e39b88aa22b5100ec458634c70bfe 100644
(file)
--- a/
services/api/test/integration/keep_proxy_test.rb
+++ b/
services/api/test/integration/keep_proxy_test.rb
@@
-2,7
+2,7
@@
require 'test_helper'
class KeepProxyTest < ActionDispatch::IntegrationTest
test "request keep disks" do
class KeepProxyTest < ActionDispatch::IntegrationTest
test "request keep disks" do
- get "/arvados/v1/keep_services/access
a
ble", {:format => :json}, auth(:active)
+ get "/arvados/v1/keep_services/access
i
ble", {:format => :json}, auth(:active)
assert_response :success
services = json_response['items']
assert_response :success
services = json_response['items']
@@
-10,7
+10,7
@@
class KeepProxyTest < ActionDispatch::IntegrationTest
assert_equal 'disk', services[0]['service_type']
assert_equal 'disk', services[1]['service_type']
assert_equal 'disk', services[0]['service_type']
assert_equal 'disk', services[1]['service_type']
- get "/arvados/v1/keep_services/access
able", {:format => :json}, auth(:active).merge({'HTTP_X_KEEP_PROXY_REQUIRED' => true
})
+ get "/arvados/v1/keep_services/access
ible", {:format => :json}, auth(:active).merge({'HTTP_X_EXTERNAL_CLIENT' => '1'
})
assert_response :success
services = json_response['items']
assert_response :success
services = json_response['items']