From 7d09beb57035965d4cf47cbf0ae660030285db22 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 27 Mar 2011 17:08:03 +0100 Subject: [PATCH] Fixed tests to handle multi-part confirmation email --- test/integration/user_creation_test.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb index c9b71e3ca..c53fd575f 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -113,8 +113,10 @@ class UserCreationTest < ActionController::IntegrationTest assert_equal register_email.to[0], new_email # Check that the confirm account url is correct confirm_regex = Regexp.new("/user/redirect_tester/confirm\\?confirm_string=([a-zA-Z0-9]*)") - assert_match(confirm_regex, register_email.body) - confirm_string = register_email.body.match(confirm_regex)[1] + register_email.parts.each do |part| + assert_match(confirm_regex, part.body) + end + confirm_string = register_email.parts[0].body.match(confirm_regex)[1] # Check the page assert_response :success @@ -208,8 +210,10 @@ class UserCreationTest < ActionController::IntegrationTest assert_equal register_email.to[0], new_email # Check that the confirm account url is correct confirm_regex = Regexp.new("/user/redirect_tester_openid/confirm\\?confirm_string=([a-zA-Z0-9]*)") - assert_match(confirm_regex, register_email.body) - confirm_string = confirm_regex.match(register_email.body)[1] + register_email.parts.each do |part| + assert_match(confirm_regex, part.body) + end + confirm_string = register_email.parts[0].body.match(confirm_regex)[1] # Check the page assert_response :success -- 2.43.2