6013: update user notification email upon setup.

diff --git a/services/api/app/mailers/user_notifier.rb b/services/api/app/mailers/user_notifier.rb
index 055fe3ad04a27e411d5e0a1b129ff2b3f8ae5887..7c96d718cc3246c78d536f0580c8f83486584186 100644 (file)
--- a/services/api/app/mailers/user_notifier.rb
+++ b/services/api/app/mailers/user_notifier.rb
@@ -5,7 +5,7 @@ class UserNotifier < ActionMailer::Base
 
   def account_is_setup(user)
     @user = user
-    mail(to: user.email, subject: 'Welcome to Curoverse')
+    mail(to: user.email, subject: 'Welcome to Curoverse - shell account enabled')
   end
 
 end

diff --git a/services/api/app/views/user_notifier/account_is_setup.text.erb b/services/api/app/views/user_notifier/account_is_setup.text.erb
index 5d8c9e7d25fa3c0b5896b5de92a7b004cdcd76a3..480b6dd8c7e48e29844fdab45e4301007d8df8fa 100644 (file)
--- a/services/api/app/views/user_notifier/account_is_setup.text.erb
+++ b/services/api/app/views/user_notifier/account_is_setup.text.erb
@@ -4,10 +4,11 @@
 Hi there,
 <% end -%>
 
-Your Arvados account has been set up. You can log in with your Google account
-associated with the e-mail address <%= @user.email %><% if Rails.configuration.workbench_address %> at:
+Your Arvados shell account has been set up. Please visit the manage account page <% if Rails.configuration.workbench_address %>at
 
-  <%= Rails.configuration.workbench_address %><% else %>.<% end %>
+  <%= Rails.configuration.workbench_address %>/manage_account <% else %><% end %>
+
+for connection instructions.
 
 Thanks,
 The Arvados team.

diff --git a/services/api/test/functional/arvados/v1/users_controller_test.rb b/services/api/test/functional/arvados/v1/users_controller_test.rb
index e87068c5effdc69988fecbcdf41d111d581ea72f..c4a99648cb25982723b370afdb5e61d31d3ef427 100644 (file)
--- a/services/api/test/functional/arvados/v1/users_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/users_controller_test.rb
@@ -653,11 +653,9 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase
 
     assert_equal Rails.configuration.user_notifier_email_from, setup_email.from[0]
     assert_equal 'foo@example.com', setup_email.to[0]
-    assert_equal 'Welcome to Curoverse', setup_email.subject
-    assert (setup_email.body.to_s.include? 'Your Arvados account has been set up'),
-        'Expected Your Arvados account has been set up in email body'
-    assert (setup_email.body.to_s.include? 'foo@example.com'),
-        'Expected user email in email body'
+    assert_equal 'Welcome to Curoverse - shell account enabled', setup_email.subject
+    assert (setup_email.body.to_s.include? 'Your Arvados shell account has been set up'),
+        'Expected Your Arvados shell account has been set up in email body'
     assert (setup_email.body.to_s.include? Rails.configuration.workbench_address),
         'Expected workbench url in email body'
   end

diff --git a/services/api/test/unit/user_notifier_test.rb b/services/api/test/unit/user_notifier_test.rb
index b280ae7f08c24ff322b57c347f0a4f7f8843d89f..8629f2951ac2652747051e03b38332df0031ae98 100644 (file)
--- a/services/api/test/unit/user_notifier_test.rb
+++ b/services/api/test/unit/user_notifier_test.rb
@@ -12,11 +12,9 @@ class UserNotifierTest < ActionMailer::TestCase
     # Test the body of the sent email contains what we expect it to
     assert_equal Rails.configuration.user_notifier_email_from, email.from.first
     assert_equal user.email, email.to.first
-    assert_equal 'Welcome to Curoverse', email.subject
-    assert (email.body.to_s.include? 'Your Arvados account has been set up'),
-        'Expected Your Arvados account has been set up in email body'
-    assert (email.body.to_s.include? user.email),
-        'Expected user email in email body'
+    assert_equal 'Welcome to Curoverse - shell account enabled', email.subject
+    assert (email.body.to_s.include? 'Your Arvados shell account has been set up'),
+        'Expected Your Arvados shell account has been set up in email body'
     assert (email.body.to_s.include? Rails.configuration.workbench_address),
         'Expected workbench url in email body'
   end