16392: Update tests.
authorTom Clegg <tom@tomclegg.ca>
Tue, 12 May 2020 23:01:54 +0000 (19:01 -0400)
committerTom Clegg <tom@tomclegg.ca>
Tue, 12 May 2020 23:01:54 +0000 (19:01 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

apps/workbench/test/integration/user_settings_menu_test.rb
services/api/test/functional/arvados/v1/keep_services_controller_test.rb

index 5f2886c7a3a0bb7277cf3b536dc65fbc25fac136..99076bbaf77731e815c6f0e3b660e05dd582766c 100644 (file)
@@ -188,7 +188,7 @@ class UserSettingsMenuTest < ActionDispatch::IntegrationTest
     end
     assert_text ":active/workbenchtest.git"
     assert_match /git@git.*:active\/workbenchtest.git/, page.text
-    assert_match /#{Rails.configuration.Services.GitHTTP.ExternalURL.to_s}\/active\/workbenchtest.git/, page.text
+    assert_match /#{Rails.configuration.Services.GitHTTP.ExternalURL.to_s}active\/workbenchtest.git/, page.text
   end
 
   [
index 867ab35e795f522370ca5b61e6a4c4a900ffabbc..ce1d447f16ad0f950327ecfa1e47f7cb24fcd76f 100644 (file)
@@ -54,7 +54,7 @@ class Arvados::V1::KeepServicesControllerTest < ActionController::TestCase
       headers: auth(:active)
     assert_response :success
     json_response['items'].each do |svc|
-      url = "#{svc['service_ssl_flag'] ? 'https' : 'http'}://#{svc['service_host']}:#{svc['service_port']}"
+      url = "#{svc['service_ssl_flag'] ? 'https' : 'http'}://#{svc['service_host']}:#{svc['service_port']}/"
       assert_equal true, expect_rvz.has_key?(url), "#{url} does not match any configured service: expecting #{expect_rvz}"
       rvz = expect_rvz[url]
       if rvz.is_a? String