[ARVADOS] updated: 1.3.0-1255-g3100cf66f

[Git user]

Summary of changes:
 apps/workbench/config/application.default.yml              | 6 ------
 apps/workbench/test/integration/application_layout_test.rb | 7 ++++++-
 2 files changed, 6 insertions(+), 7 deletions(-)

       via  3100cf66fee222eed832bd813cc0b7430bed0f93 (commit)
      from  0ae86abfecf30143d3e1484fedbb7ac4a2fb075a (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 3100cf66fee222eed832bd813cc0b7430bed0f93
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Jul 8 11:20:36 2019 -0400

    14812: Remove obsolete defaults from development section
    
    Fix tests
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 3e2f2b134..8d1dff995 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -53,12 +53,6 @@ development:
   action_dispatch.best_standards_support: :builtin
   assets.debug: true
   profiling_enabled: true
-  site_name: Arvados Workbench (dev)
-
-  # API server configuration
-  arvados_login_base: ~
-  arvados_v1_base: ~
-  arvados_insecure_https: ~
 
 production:
   force_ssl: true
diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index 4ca146e68..505767814 100644
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -153,7 +153,12 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
   ].each do |wb2_url_config, wb2_menu_appear|
     test "workbench2_url=#{wb2_url_config} should#{wb2_menu_appear ? '' : ' not'} show WB2 menu" do
       Rails.configuration.Services.Workbench2.ExternalURL = URI(wb2_url_config)
-      assert_equal wb2_menu_appear, ConfigValidators.validate_wb2_url_config()
+      if !wb2_menu_appear and !wb2_url_config.empty?
+        assert_raises RuntimeError do
+          ConfigValidators.validate_wb2_url_config()
+        end
+        Rails.configuration.Services.Workbench2.ExternalURL = URI("")
+      end
 
       visit page_with_token('active')
       within('.navbar-fixed-top') do

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


hooks/post-receive
--