From: Peter Amstutz Date: Tue, 2 Jan 2024 14:56:14 +0000 (-0500) Subject: 21059: Fix "Arvado" typo. Use URI::join. X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/c821bfc6028b78d5272d7721541dae64c828bdbc 21059: Fix "Arvado" typo. Use URI::join. Also delete some commented-out debug code. Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- 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 8a002fe172..22298b1ce7 100644 --- 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 f62094b4eb..920906d833 100644 --- 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 df1a225970..f42fda4150 100644 --- 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