[ARVADOS] updated: fcfc006561b72f76fa4a553aa294a884462e7ca4

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/test/controllers/users_controller_test.rb   | 14 ++++++++------
 .../workbench/test/integration/user_manage_account_test.rb |  3 ++-
 2 files changed, 10 insertions(+), 7 deletions(-)

       via  fcfc006561b72f76fa4a553aa294a884462e7ca4 (commit)
      from  cde755bd4d7702c89ebfbd6d2fe8f852509d3786 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit fcfc006561b72f76fa4a553aa294a884462e7ca4
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Feb 12 10:13:46 2015 -0500

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

diff --git a/apps/workbench/test/controllers/users_controller_test.rb b/apps/workbench/test/controllers/users_controller_test.rb
index 125d6b0..ebec4a3 100644
--- 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 d0ddb49..9b5e5d6 100644
--- 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

-----------------------------------------------------------------------


hooks/post-receive
--