[ARVADOS] updated: 1.3.0-556-gb8fc1058a

Git user git at public.curoverse.com
Tue Mar 26 18:39:40 UTC 2019


Summary of changes:
 services/api/app/controllers/arvados/v1/schema_controller.rb      | 8 ++++----
 services/api/test/functional/arvados/v1/schema_controller_test.rb | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

       via  b8fc1058a62bf09e4c02653f77cefc976f22b666 (commit)
      from  0e69c4decb949988fc6de4374b62bb25e80aa97f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit b8fc1058a62bf09e4c02653f77cefc976f22b666
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Tue Mar 26 14:38:59 2019 -0400

    13996: Explicitly get string representation of URLs
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/api/app/controllers/arvados/v1/schema_controller.rb b/services/api/app/controllers/arvados/v1/schema_controller.rb
index 0d85a272b..f2391fc43 100644
--- a/services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/services/api/app/controllers/arvados/v1/schema_controller.rb
@@ -63,10 +63,10 @@ class Arvados::V1::SchemaController < ApplicationController
         crunchLogUpdateSize: Rails.configuration.Containers["Logging"]["LogUpdateSize"],
         remoteHosts: Rails.configuration.RemoteClusters.map {|k,v| v["Host"]},
         remoteHostsViaDNS: Rails.configuration.RemoteClusters["*"]["Proxy"],
-        websocketUrl: Rails.configuration.Services["Websocket"]["ExternalURL"],
-        workbenchUrl: Rails.configuration.Services["Workbench1"]["ExternalURL"],
-        keepWebServiceUrl: Rails.configuration.Services["WebDAV"]["ExternalURL"],
-        gitUrl: Rails.configuration.Services["GitHTTP"]["ExternalURL"],
+        websocketUrl: Rails.configuration.Services["Websocket"]["ExternalURL"].to_s,
+        workbenchUrl: Rails.configuration.Services["Workbench1"]["ExternalURL"].to_s,
+        keepWebServiceUrl: Rails.configuration.Services["WebDAV"]["ExternalURL"].to_s,
+        gitUrl: Rails.configuration.Services["GitHTTP"]["ExternalURL"].to_s,
         parameters: {
           alt: {
             type: "string",
diff --git a/services/api/test/functional/arvados/v1/schema_controller_test.rb b/services/api/test/functional/arvados/v1/schema_controller_test.rb
index 5c7b54067..80cd6de16 100644
--- a/services/api/test/functional/arvados/v1/schema_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/schema_controller_test.rb
@@ -33,8 +33,8 @@ class Arvados::V1::SchemaControllerTest < ActionController::TestCase
     assert_match(/^[0-9a-f]+(-modified)?$/, discovery_doc['source_version'])
     assert_match(/^[0-9a-f]+(-modified)?$/, discovery_doc['sourceVersion'])
     assert_match(/^unknown$/, discovery_doc['packageVersion'])
-    assert_equal discovery_doc['websocketUrl'], Rails.configuration.Services["Websocket"]["ExternalURL"]
-    assert_equal discovery_doc['workbenchUrl'], Rails.configuration.Services["Workbench1"]["ExternalURL"]
+    assert_equal discovery_doc['websocketUrl'], Rails.configuration.Services["Websocket"]["ExternalURL"].to_s
+    assert_equal discovery_doc['workbenchUrl'], Rails.configuration.Services["Workbench1"]["ExternalURL"].to_s
     assert_equal('zzzzz', discovery_doc['uuidPrefix'])
   end
 

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list