From: Peter Amstutz Date: Wed, 22 Jan 2020 17:23:07 +0000 (-0500) Subject: Fix test refs #16051 X-Git-Tag: 2.0.0~35 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/b871183da9ae071b277bfbd362f1cd3b0bde7076?hp=ee38970362aa72e8aeb875ce15028fffd7834a3b Fix test refs #16051 Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- 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 0bc941accf..753e707b62 100644 --- a/services/api/test/functional/arvados/v1/users_controller_test.rb +++ b/services/api/test/functional/arvados/v1/users_controller_test.rb @@ -595,7 +595,7 @@ class Arvados::V1::UsersControllerTest < ActionController::TestCase assert_equal Rails.configuration.Users.UserNotifierEmailFrom, setup_email.from[0] assert_equal 'foo@example.com', setup_email.to[0] - assert_equal 'Welcome to Arvados - shell account enabled', setup_email.subject + assert_equal 'Welcome to Arvados - 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.Services.Workbench1.ExternalURL}users/#{created['uuid']}/virtual_machines"), 'Expected virtual machines url in email body' diff --git a/services/api/test/unit/user_notifier_test.rb b/services/api/test/unit/user_notifier_test.rb index f409d231f1..da6c7fdb88 100644 --- a/services/api/test/unit/user_notifier_test.rb +++ b/services/api/test/unit/user_notifier_test.rb @@ -16,7 +16,7 @@ class UserNotifierTest < ActionMailer::TestCase # Test the body of the sent email contains what we expect it to assert_equal Rails.configuration.Users.UserNotifierEmailFrom, email.from.first assert_equal user.email, email.to.first - assert_equal 'Welcome to Arvados - shell account enabled', email.subject + assert_equal 'Welcome to Arvados - 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.Services.Workbench1.ExternalURL.to_s),