Also delete some commented-out debug code.
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
<%= @user.full_name %> <<%= @user.email %>> (<%= @user.username %>)
<%= @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:
<% 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}") %>
<% if Rails.configuration.Services.Workbench1.ExternalURL -%>
Please see Workbench for more information:
<% 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}") %>
assert_equal 'foo@example.com', json_response['email']
assert_equal 'barney', json_response['username']
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
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