X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/edb68e839f4830e722bf187af7e77c9a248551a8..2b04242462faf88ed4634b034b7f2abdde83e17a:/test/integration/user_creation_test.rb

diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index 79772d444..3c716e99e 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 = 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
@@ -133,7 +135,7 @@ class UserCreationTest < ActionController::IntegrationTest
     assert_response :redirect # but it not redirects to /user/<display_name>/traces
     follow_redirect!
     assert_response :success
-    assert_template "trace/list.html.erb"
+    assert_template 'trace/list'
   end
 
   def test_user_create_openid_success
@@ -145,7 +147,7 @@ class UserCreationTest < ActionController::IntegrationTest
         post "/user/terms",
           {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser", :pass_crypt => "", :pass_crypt_confirmation => ""}}
         assert_response :redirect
-        res = openid_request(@response.redirected_to)
+        res = openid_request(@response.redirect_url)
         post '/user/terms', res
         assert_response :success
         assert_template 'terms'
@@ -172,7 +174,7 @@ class UserCreationTest < ActionController::IntegrationTest
         post "/user/terms",
           {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.failure=newuser", :pass_crypt => "", :pass_crypt_confirmation => ""}}
         assert_response :redirect
-        res = openid_request(@response.redirected_to)
+        res = openid_request(@response.redirect_url)
         post '/user/terms', res
         assert_response :success
         assert_template 'user/new'
@@ -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
@@ -228,6 +232,6 @@ class UserCreationTest < ActionController::IntegrationTest
     assert_response :redirect # but it not redirects to /user/<display_name>/traces
     follow_redirect!
     assert_response :success
-    assert_template "trace/list.html.erb"
+    assert_template "trace/list"
   end
 end