21059: Fix "Arvado" typo. Use URI::join.

Also delete some commented-out debug code.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

diff --git a/services/api/app/views/admin_notifier/new_inactive_user.text.erb b/services/api/app/views/admin_notifier/new_inactive_user.text.erb
index 8a002fe172a839d5dde2f12a1a7ee536a414ac3c..22298b1ce7807561d3bacc54b05d8c71167c28aa 100644 (file)
--- a/services/api/app/views/admin_notifier/new_inactive_user.text.erb
+++ b/services/api/app/views/admin_notifier/new_inactive_user.text.erb
@@ -6,12 +6,12 @@ A new user has been created, but not set up.
 
   <%= @user.full_name %> <<%= @user.email %>> (<%= @user.username %>)
 
-They will not be able to use Arvado unless set up by an admin.
+They will not be able to use Arvados unless set up by an admin.
 
 <% if Rails.configuration.Services.Workbench1.ExternalURL -%>
 Please see Workbench for more information:
 
-  <%= Rails.configuration.Services.Workbench1.ExternalURL %>user/<%=@user.uuid%>
+  <%= URI::join(Rails.configuration.Services.Workbench1.ExternalURL, "user/#{@user.uuid}") %>
 
 <% end -%>
 Thanks,

diff --git a/services/api/app/views/admin_notifier/new_user.text.erb b/services/api/app/views/admin_notifier/new_user.text.erb
index f62094b4eb8839ec6c6702c5349b1fad823831c5..920906d83367878473ac1a60ae250ccd8f442ae5 100644 (file)
--- a/services/api/app/views/admin_notifier/new_user.text.erb
+++ b/services/api/app/views/admin_notifier/new_user.text.erb
@@ -11,7 +11,7 @@ They are able to use Arvados.
 <% if Rails.configuration.Services.Workbench1.ExternalURL -%>
 Please see Workbench for more information:
 
-  <%= Rails.configuration.Services.Workbench1.ExternalURL %>user/<%=@user.uuid%>
+  <%= URI::join(Rails.configuration.Services.Workbench1.ExternalURL, "user/#{@user.uuid}") %>
 
 <% end -%>
 Thanks,

diff --git a/services/api/test/integration/remote_user_test.rb b/services/api/test/integration/remote_user_test.rb
index df1a2259700e5212ed69c1c71b92f422a7aa6fc9..f42fda415077ae4db9ba4496e0e3269df4734453 100644 (file)
--- a/services/api/test/integration/remote_user_test.rb
+++ b/services/api/test/integration/remote_user_test.rb
@@ -385,10 +385,6 @@ class RemoteUsersTest < ActionDispatch::IntegrationTest
     assert_equal 'foo@example.com', json_response['email']
     assert_equal 'barney', json_response['username']
 
-    # ActionMailer::Base.deliveries.each do |d|
-    #   puts "--- delivery #{d.inspect} #{d.body}"
-    # end
-
     assert_equal 2, ActionMailer::Base.deliveries.length
     assert_equal "Welcome to Arvados - account enabled", ActionMailer::Base.deliveries[0].subject
     assert_equal "[ARVADOS] New user created notification", ActionMailer::Base.deliveries[1].subject