[ARVADOS] updated: 1.1.0-134-ge1da244

[Git user]

Summary of changes:
 .../api/test/functional/arvados/v1/schema_controller_test.rb   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

       via  e1da2448fac9f060cdfe7f62a8783cd9b8cfaf96 (commit)
      from  a5d1a2aa40ad211b4faf870c603ae7ad5263b6bc (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 e1da2448fac9f060cdfe7f62a8783cd9b8cfaf96
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Nov 9 13:26:09 2017 -0500

    12515: Add discovery doc test.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

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 b1a7b5b..235b78e 100644
--- a/services/api/test/functional/arvados/v1/schema_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/schema_controller_test.rb
@@ -24,19 +24,15 @@ class Arvados::V1::SchemaControllerTest < ActionController::TestCase
                  "discovery document was generated >#{MAX_SCHEMA_AGE}s ago")
   end
 
-  test "discovery document has defaultTrashLifetime" do
+  test "discovery document fields" do
     get :index
     assert_response :success
     discovery_doc = JSON.parse(@response.body)
     assert_includes discovery_doc, 'defaultTrashLifetime'
     assert_equal discovery_doc['defaultTrashLifetime'], Rails.application.config.default_trash_lifetime
-  end
-
-  test "discovery document has source_version" do
-    get :index
-    assert_response :success
-    discovery_doc = JSON.parse(@response.body)
     assert_match(/^[0-9a-f]+(-modified)?$/, discovery_doc['source_version'])
+    assert_equal discovery_doc['websocketUrl'], Rails.application.config.websocket_address
+    assert_equal discovery_doc['workbenchUrl'], Rails.application.config.workbench_address
   end
 
   test "discovery document overrides source_version with config" do

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


hooks/post-receive
--