7709: Merge branch 'master' into 7709-api-rails4

[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..aacda517f24b8e5433f599f9e86306b3c7aaad46 100644 (file)
--- a/services/api/test/integration/keep_proxy_test.rb
+++ b/services/api/test/integration/keep_proxy_test.rb
@@ -2,24 +2,27 @@ require 'test_helper'
 
 class KeepProxyTest < ActionDispatch::IntegrationTest
   test "request keep disks" do
-    get "/arvados/v1/keep_services/accessable", {:format => :json}, auth(:active)
+    get "/arvados/v1/keep_services/accessible", {:format => :json}, auth(:active)
     assert_response :success
     services = json_response['items']
 
-    assert_equal 2, services.length
-    assert_equal 'disk', services[0]['service_type']
-    assert_equal 'disk', services[1]['service_type']
+    assert_operator 2, :<=, services.length
+    services.each do |service|
+      assert_equal 'disk', service['service_type']
+    end
+  end
 
-    get "/arvados/v1/keep_services/accessable", {:format => :json}, auth(:active).merge({'HTTP_X_KEEP_PROXY_REQUIRED' => true})
+  test "request keep proxy" do
+    get "/arvados/v1/keep_services/accessible", {:format => :json}, auth(:active).merge({'HTTP_X_EXTERNAL_CLIENT' => '1'})
     assert_response :success
     services = json_response['items']
 
     assert_equal 1, services.length
 
-    assert_equal "zzzzz-bi6l4-h0a0xwut9qa6g3a", services[0]['uuid']
-    assert_equal "keep.qr1hi.arvadosapi.com", services[0]['service_host']
-    assert_equal 25333, services[0]['service_port']
-    assert_equal true, services[0]['service_ssl_flag']
+    assert_equal keep_services(:proxy).uuid, services[0]['uuid']
+    assert_equal keep_services(:proxy).service_host, services[0]['service_host']
+    assert_equal keep_services(:proxy).service_port, services[0]['service_port']
+    assert_equal keep_services(:proxy).service_ssl_flag, services[0]['service_ssl_flag']
     assert_equal 'proxy', services[0]['service_type']
   end
 end