4951: Empty out ActionMailer::Base.deliveries so we can count deliveries caused by...

diff --git a/apps/workbench/test/controllers/users_controller_test.rb b/apps/workbench/test/controllers/users_controller_test.rb
index 125d6b08856959904341ef78b42c43ff1a2b58ba..ebec4a3d226821a785a7604b2a4c42171e3885fd 100644 (file)
--- a/apps/workbench/test/controllers/users_controller_test.rb
+++ b/apps/workbench/test/controllers/users_controller_test.rb
@@ -44,21 +44,23 @@ class UsersControllerTest < ActionController::TestCase
   test "request shell access" do
     user = api_fixture('users')['spectator']
 
+    ActionMailer::Base.deliveries = []
+
     post :request_shell_access, {
       id: user['uuid'],
       format: 'js'
     }, session_for(:spectator)
     assert_response :success
 
-    found_email = false
-    ActionMailer::Base.deliveries.andand.each do |email|
-      full_name = (user['first_name'] || "") + " " + (user['last_name'] || "")
-      expected = "Shell account request from #{full_name} (#{user['email']}, #{user['uuid']})"
+    full_name = "#{user['first_name']} #{user['last_name']}"
+    expected = "Shell account request from #{full_name} (#{user['email']}, #{user['uuid']})"
+    found_email = 0
+    ActionMailer::Base.deliveries.each do |email|
       if email.subject.include?(expected)
-        found_email = true
+        found_email += 1
         break
       end
     end
-    assert_equal true, found_email, "Expected email after requesting shell access"
+    assert_equal 1, found_email, "Expected 1 email after requesting shell access"
   end
 end

diff --git a/apps/workbench/test/integration/user_manage_account_test.rb b/apps/workbench/test/integration/user_manage_account_test.rb
index d0ddb499a62a8d22c0f24dee40c53d52dcd978d1..9b5e5d61e17ec0495cc1dc3dffc19e5395db8604 100644 (file)
--- a/apps/workbench/test/integration/user_manage_account_test.rb
+++ b/apps/workbench/test/integration/user_manage_account_test.rb
@@ -135,6 +135,7 @@ class UserManageAccountTest < ActionDispatch::IntegrationTest
   end
 
   test "request shell access" do
+    ActionMailer::Base.deliveries = []
     visit page_with_token('spectator', '/manage_account')
     assert_text 'You do not have access to any virtual machines'
     click_link 'Send request for shell access'
@@ -151,7 +152,7 @@ class UserManageAccountTest < ActionDispatch::IntegrationTest
     full_name = "#{user['first_name']} #{user['last_name']}"
     expected = "Shell account request from #{full_name} (#{user['email']}, #{user['uuid']})"
     found_email = 0
-    ActionMailer::Base.deliveries.andand.each do |email|
+    ActionMailer::Base.deliveries.each do |email|
       if email.subject.include?(expected)
         found_email += 1
       end