Recover properly from a failed notes load

[rails.git] / test / integration / user_creation_test.rb

diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index 3c716e99ec17f33df31608736966ab69ce976853..b5b3e91c7a99a2ddd1cefee600339b0c871bc542 100644 (file)
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -71,7 +71,7 @@ class UserCreationTest < ActionController::IntegrationTest
 
       assert_equal register_email.to[0], new_email
       # Check that the confirm account url is correct
 
       assert_equal register_email.to[0], new_email
       # Check that the confirm account url is correct

-      assert_match /#{@url}/, register_email.body
+      assert_match /#{@url}/, register_email.body.to_s

 
       # Check the page
       assert_response :success
 
       # Check the page
       assert_response :success


@@ -114,7 +114,7 @@ class UserCreationTest < ActionController::IntegrationTest
     # Check that the confirm account url is correct
     confirm_regex = Regexp.new("/user/redirect_tester/confirm\\?confirm_string=([a-zA-Z0-9]*)")
     register_email.parts.each do |part|
     # Check that the confirm account url is correct
     confirm_regex = Regexp.new("/user/redirect_tester/confirm\\?confirm_string=([a-zA-Z0-9]*)")
     register_email.parts.each do |part|

-      assert_match(confirm_regex, part.body)
+      assert_match confirm_regex, part.body.to_s

     end
     confirm_string = register_email.parts[0].body.match(confirm_regex)[1]
 
     end
     confirm_string = register_email.parts[0].body.match(confirm_regex)[1]
 


@@ -211,7 +211,7 @@ class UserCreationTest < ActionController::IntegrationTest
     # Check that the confirm account url is correct
     confirm_regex = Regexp.new("/user/redirect_tester_openid/confirm\\?confirm_string=([a-zA-Z0-9]*)")
     register_email.parts.each do |part|
     # Check that the confirm account url is correct
     confirm_regex = Regexp.new("/user/redirect_tester_openid/confirm\\?confirm_string=([a-zA-Z0-9]*)")
     register_email.parts.each do |part|

-      assert_match(confirm_regex, part.body)
+      assert_match confirm_regex, part.body.to_s

     end
     confirm_string = register_email.parts[0].body.match(confirm_regex)[1]
 
     end
     confirm_string = register_email.parts[0].body.match(confirm_regex)[1]