Replace "Login" labels with "Log in" when used as a verb

[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 8ec0dc9bc049e2486458f50b650034e5d0f52beb..1f749f9579617b27fd4af4f3c68cb0a82d994d94 100644 (file)
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -65,6 +65,26 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     assert_select "form > div > input.is-invalid#user_display_name"
   end
 
     assert_select "form > div > input.is-invalid#user_display_name"
   end
 

+  def test_user_create_submit_mismatched_passwords
+    email = "newtester@osm.org"
+    display_name = "new_tester"
+    assert_difference("User.count", 0) do
+      assert_difference("ActionMailer::Base.deliveries.size", 0) do
+        perform_enqueued_jobs do
+          post "/user/new",
+               :params => { :user => { :email => email,
+                                       :email_confirmation => email,
+                                       :display_name => display_name,
+                                       :pass_crypt => "testtest",
+                                       :pass_crypt_confirmation => "blahblah" } }
+        end
+      end
+    end
+    assert_response :success
+    assert_template "users/new"
+    assert_select "form > div > input.is-invalid#user_pass_crypt_confirmation"
+  end
+

   def test_user_create_success
     new_email = "newtester@osm.org"
     display_name = "new_tester"
   def test_user_create_success
     new_email = "newtester@osm.org"
     display_name = "new_tester"


@@ -94,18 +114,28 @@ class UserCreationTest < ActionDispatch::IntegrationTest
       end
     end
 
       end
     end
 

-    # Check the e-mail
-    register_email = ActionMailer::Base.deliveries.first
-
-    assert_equal register_email.to.first, new_email
-    # Check that the confirm account url is correct
-    assert_match(/#{@url}/, register_email.body.to_s)
-
-    # Check the page

     assert_response :success
     assert_template "confirmations/confirm"
 
     assert_response :success
     assert_template "confirmations/confirm"
 

+    user = User.find_by(:email => "newtester@osm.org")
+    assert_not_nil user
+    assert_not_predicate user, :active?
+
+    register_email = ActionMailer::Base.deliveries.first
+    assert_equal register_email.to.first, new_email
+    found_confirmation_url = register_email.parts.first.parts.first.to_s =~ %r{\shttp://test.host(/\S+)\s}
+    assert found_confirmation_url
+    confirmation_url = Regexp.last_match(1)

     ActionMailer::Base.deliveries.clear
     ActionMailer::Base.deliveries.clear

+
+    post confirmation_url
+
+    assert_redirected_to welcome_path
+
+    user.reload
+    assert_predicate user, :active?
+
+    assert_equal user, User.authenticate(:username => new_email, :password => "testtest")

   end
 
   def test_user_create_no_tou_failure
   end
 
   def test_user_create_no_tou_failure


@@ -178,11 +208,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct

-    confirm_regex = Regexp.new("/user/redirect_tester/confirm\\?confirm_string=([a-zA-Z0-9_-]*)")
+    confirm_regex = Regexp.new("confirm_string=([a-zA-Z0-9%_-]*)")

     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end
     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end

-    confirm_string = email_text_parts(register_email).first.body.match(confirm_regex)[1]
+    confirm_string = CGI.unescape(email_text_parts(register_email).first.body.match(confirm_regex)[1])

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


@@ -191,11 +221,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page

-    get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
+    get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }

     assert_response :success
     assert_template "confirmations/confirm"
 
     assert_response :success
     assert_template "confirmations/confirm"
 

-    post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
+    post "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }

     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success


@@ -219,13 +249,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :auth_uid => "http://localhost:1123/new.tester",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }
                                        :auth_uid => "http://localhost:1123/new.tester",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }

-          assert_response :redirect

           assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
           post response.location
           assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
           post response.location

-          assert_response :redirect

           assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
           follow_redirect!
           assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
           follow_redirect!

-          assert_response :redirect

           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,
           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,


@@ -265,13 +292,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :auth_uid => "http://localhost:1123/new.tester",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }
                                        :auth_uid => "http://localhost:1123/new.tester",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }

-          assert_response :redirect

           assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
           post response.location
           assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
           post response.location

-          assert_response :redirect

           assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
           follow_redirect!
           assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
           follow_redirect!

-          assert_response :redirect

           assert_redirected_to auth_failure_path(:strategy => "openid", :message => "connection_failed", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to auth_failure_path(:strategy => "openid", :message => "connection_failed", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect


@@ -304,13 +328,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" },
                             :referer => referer }
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" },
                             :referer => referer }

-          assert_response :redirect

           assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
           post response.location
           assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
           post response.location

-          assert_response :redirect

           assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
           follow_redirect!
           assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
           follow_redirect!

-          assert_response :redirect

           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,
           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,


@@ -331,11 +352,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct
 
     assert_equal register_email.to.first, 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_-]*)")
+    confirm_regex = Regexp.new("confirm_string=([a-zA-Z0-9%_-]*)")

     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end
     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end

-    confirm_string = email_text_parts(register_email).first.body.match(confirm_regex)[1]
+    confirm_string = CGI.unescape(email_text_parts(register_email).first.body.match(confirm_regex)[1])

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


@@ -344,11 +365,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page

-    get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
+    get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }

     assert_response :success
     assert_template "confirmations/confirm"
 
     assert_response :success
     assert_template "confirmations/confirm"
 

-    post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
+    post "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }

     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success


@@ -372,13 +393,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :auth_provider => "google",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }
                                        :auth_provider => "google",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }

-          assert_response :redirect

           assert_redirected_to auth_path(:provider => "google", :origin => "/user/new")
           post response.location
           assert_redirected_to auth_path(:provider => "google", :origin => "/user/new")
           post response.location

-          assert_response :redirect

           assert_redirected_to auth_success_path(:provider => "google")
           follow_redirect!
           assert_redirected_to auth_success_path(:provider => "google")
           follow_redirect!

-          assert_response :redirect

           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,
           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,


@@ -389,7 +407,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :pass_crypt => password,
                                        :pass_crypt_confirmation => password },
                             :read_ct => 1, :read_tou => 1 }
                                        :pass_crypt => password,
                                        :pass_crypt_confirmation => password },
                             :read_ct => 1, :read_tou => 1 }

-          assert_response :redirect

           assert_redirected_to welcome_path
           follow_redirect!
         end
           assert_redirected_to welcome_path
           follow_redirect!
         end


@@ -418,13 +435,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :auth_provider => "google",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }
                                        :auth_provider => "google",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }

-          assert_response :redirect

           assert_redirected_to auth_path(:provider => "google", :origin => "/user/new")
           post response.location
           assert_redirected_to auth_path(:provider => "google", :origin => "/user/new")
           post response.location

-          assert_response :redirect

           assert_redirected_to auth_success_path(:provider => "google")
           follow_redirect!
           assert_redirected_to auth_success_path(:provider => "google")
           follow_redirect!

-          assert_response :redirect

           assert_redirected_to auth_failure_path(:strategy => "google", :message => "connection_failed", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to auth_failure_path(:strategy => "google", :message => "connection_failed", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect


@@ -458,13 +472,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" },
                             :referer => referer }
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" },
                             :referer => referer }

-          assert_response :redirect

           assert_redirected_to auth_path(:provider => "google", :origin => "/user/new")
           post response.location
           assert_redirected_to auth_path(:provider => "google", :origin => "/user/new")
           post response.location

-          assert_response :redirect

           assert_redirected_to auth_success_path(:provider => "google")
           follow_redirect!
           assert_redirected_to auth_success_path(:provider => "google")
           follow_redirect!

-          assert_response :redirect

           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,
           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,


@@ -485,11 +496,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct

-    confirm_regex = Regexp.new("/user/redirect_tester_google/confirm\\?confirm_string=([a-zA-Z0-9_-]*)")
+    confirm_regex = Regexp.new("confirm_string=([a-zA-Z0-9%_-]*)")

     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end
     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end

-    confirm_string = email_text_parts(register_email).first.body.match(confirm_regex)[1]
+    confirm_string = CGI.unescape(email_text_parts(register_email).first.body.match(confirm_regex)[1])

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


@@ -498,11 +509,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page

-    get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
+    get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }

     assert_response :success
     assert_template "confirmations/confirm"
 
     assert_response :success
     assert_template "confirmations/confirm"
 

-    post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
+    post "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }

     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success


@@ -526,13 +537,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :auth_provider => "facebook",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }
                                        :auth_provider => "facebook",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }

-          assert_response :redirect

           assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new")
           post response.location
           assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new")
           post response.location

-          assert_response :redirect

           assert_redirected_to auth_success_path(:provider => "facebook")
           follow_redirect!
           assert_redirected_to auth_success_path(:provider => "facebook")
           follow_redirect!

-          assert_response :redirect

           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,
           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,


@@ -543,7 +551,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :pass_crypt => password,
                                        :pass_crypt_confirmation => password },
                             :read_ct => 1, :read_tou => 1 }
                                        :pass_crypt => password,
                                        :pass_crypt_confirmation => password },
                             :read_ct => 1, :read_tou => 1 }

-          assert_response :redirect

           assert_redirected_to welcome_path
           follow_redirect!
         end
           assert_redirected_to welcome_path
           follow_redirect!
         end


@@ -572,13 +579,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :auth_provider => "facebook",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }
                                        :auth_provider => "facebook",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }

-          assert_response :redirect

           assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new")
           post response.location
           assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new")
           post response.location

-          assert_response :redirect

           assert_redirected_to auth_success_path(:provider => "facebook")
           follow_redirect!
           assert_redirected_to auth_success_path(:provider => "facebook")
           follow_redirect!

-          assert_response :redirect

           assert_redirected_to auth_failure_path(:strategy => "facebook", :message => "connection_failed", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to auth_failure_path(:strategy => "facebook", :message => "connection_failed", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect


@@ -610,13 +614,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" },
                             :referer => referer }
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" },
                             :referer => referer }

-          assert_response :redirect

           assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new")
           post response.location
           assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new")
           post response.location

-          assert_response :redirect

           assert_redirected_to auth_success_path(:provider => "facebook")
           follow_redirect!
           assert_redirected_to auth_success_path(:provider => "facebook")
           follow_redirect!

-          assert_response :redirect

           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,
           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,


@@ -637,11 +638,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct

-    confirm_regex = Regexp.new("/user/redirect_tester_facebook/confirm\\?confirm_string=([a-zA-Z0-9_-]*)")
+    confirm_regex = Regexp.new("confirm_string=([a-zA-Z0-9%_-]*)")

     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end
     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end

-    confirm_string = email_text_parts(register_email).first.body.match(confirm_regex)[1]
+    confirm_string = CGI.unescape(email_text_parts(register_email).first.body.match(confirm_regex)[1])

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


@@ -650,11 +651,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page

-    get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
+    get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }

     assert_response :success
     assert_template "confirmations/confirm"
 
     assert_response :success
     assert_template "confirmations/confirm"
 

-    post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
+    post "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }

     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success


@@ -678,13 +679,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :auth_provider => "microsoft",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }
                                        :auth_provider => "microsoft",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }

-          assert_response :redirect

           assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new")
           post response.location
           assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new")
           post response.location

-          assert_response :redirect

           assert_redirected_to auth_success_path(:provider => "microsoft")
           follow_redirect!
           assert_redirected_to auth_success_path(:provider => "microsoft")
           follow_redirect!

-          assert_response :redirect

           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,
           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,


@@ -695,7 +693,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :pass_crypt => password,
                                        :pass_crypt_confirmation => password },
                             :read_ct => 1, :read_tou => 1 }
                                        :pass_crypt => password,
                                        :pass_crypt_confirmation => password },
                             :read_ct => 1, :read_tou => 1 }

-          assert_response :redirect

           assert_redirected_to welcome_path
           follow_redirect!
         end
           assert_redirected_to welcome_path
           follow_redirect!
         end


@@ -724,13 +721,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :auth_provider => "microsoft",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }
                                        :auth_provider => "microsoft",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }

-          assert_response :redirect

           assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new")
           post response.location
           assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new")
           post response.location

-          assert_response :redirect

           assert_redirected_to auth_success_path(:provider => "microsoft")
           follow_redirect!
           assert_redirected_to auth_success_path(:provider => "microsoft")
           follow_redirect!

-          assert_response :redirect

           assert_redirected_to auth_failure_path(:strategy => "microsoft", :message => "connection_failed", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to auth_failure_path(:strategy => "microsoft", :message => "connection_failed", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect


@@ -762,13 +756,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" },
                             :referer => referer }
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" },
                             :referer => referer }

-          assert_response :redirect

           assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new")
           post response.location
           assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new")
           post response.location

-          assert_response :redirect

           assert_redirected_to auth_success_path(:provider => "microsoft")
           follow_redirect!
           assert_redirected_to auth_success_path(:provider => "microsoft")
           follow_redirect!

-          assert_response :redirect

           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,
           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,


@@ -789,11 +780,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct

-    confirm_regex = Regexp.new("/user/redirect_tester_microsoft/confirm\\?confirm_string=([a-zA-Z0-9_-]*)")
+    confirm_regex = Regexp.new("confirm_string=([a-zA-Z0-9%_-]*)")

     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end
     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end

-    confirm_string = email_text_parts(register_email).first.body.match(confirm_regex)[1]
+    confirm_string = CGI.unescape(email_text_parts(register_email).first.body.match(confirm_regex)[1])

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


@@ -802,11 +793,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page

-    get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
+    get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }

     assert_response :success
     assert_template "confirmations/confirm"
 
     assert_response :success
     assert_template "confirmations/confirm"
 

-    post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
+    post "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }

     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success


@@ -821,7 +812,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     OmniAuth.config.add_mock(:github, :uid => "123454321", :info => { "email" => new_email })
 
     assert_difference("User.count") do
     OmniAuth.config.add_mock(:github, :uid => "123454321", :info => { "email" => new_email })
 
     assert_difference("User.count") do

-      assert_difference("ActionMailer::Base.deliveries.size", 1) do
+      assert_no_difference("ActionMailer::Base.deliveries.size") do

         perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email,
         perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email,


@@ -830,13 +821,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :auth_provider => "github",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }
                                        :auth_provider => "github",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }

-          assert_response :redirect

           assert_redirected_to auth_path(:provider => "github", :origin => "/user/new")
           post response.location
           assert_redirected_to auth_path(:provider => "github", :origin => "/user/new")
           post response.location

-          assert_response :redirect

           assert_redirected_to auth_success_path(:provider => "github")
           follow_redirect!
           assert_redirected_to auth_success_path(:provider => "github")
           follow_redirect!

-          assert_response :redirect

           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,
           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,


@@ -848,8 +836,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :pass_crypt_confirmation => password },
                             :read_ct => 1,
                             :read_tou => 1 }
                                        :pass_crypt_confirmation => password },
                             :read_ct => 1,
                             :read_tou => 1 }

-          assert_response :redirect
-          assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name
+          assert_redirected_to welcome_path

           follow_redirect!
         end
       end
           follow_redirect!
         end
       end


@@ -857,7 +844,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     # Check the page
     assert_response :success
 
     # Check the page
     assert_response :success

-    assert_template "confirmations/confirm"
+    assert_template "site/welcome"

 
     ActionMailer::Base.deliveries.clear
   end
 
     ActionMailer::Base.deliveries.clear
   end


@@ -877,13 +864,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :auth_provider => "github",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }
                                        :auth_provider => "github",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }

-          assert_response :redirect

           assert_redirected_to auth_path(:provider => "github", :origin => "/user/new")
           post response.location
           assert_redirected_to auth_path(:provider => "github", :origin => "/user/new")
           post response.location

-          assert_response :redirect

           assert_redirected_to auth_success_path(:provider => "github")
           follow_redirect!
           assert_redirected_to auth_success_path(:provider => "github")
           follow_redirect!

-          assert_response :redirect

           assert_redirected_to auth_failure_path(:strategy => "github", :message => "connection_failed", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to auth_failure_path(:strategy => "github", :message => "connection_failed", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect


@@ -915,13 +899,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" },
                             :referer => referer }
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" },
                             :referer => referer }

-          assert_response :redirect

           assert_redirected_to auth_path(:provider => "github", :origin => "/user/new")
           post response.location
           assert_redirected_to auth_path(:provider => "github", :origin => "/user/new")
           post response.location

-          assert_response :redirect

           assert_redirected_to auth_success_path(:provider => "github")
           follow_redirect!
           assert_redirected_to auth_success_path(:provider => "github")
           follow_redirect!

-          assert_response :redirect

           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,
           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,


@@ -943,11 +924,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct

-    confirm_regex = Regexp.new("/user/redirect_tester_github/confirm\\?confirm_string=([a-zA-Z0-9_-]*)")
+    confirm_regex = Regexp.new("confirm_string=([a-zA-Z0-9%_-]*)")

     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end
     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end

-    confirm_string = email_text_parts(register_email).first.body.match(confirm_regex)[1]
+    confirm_string = CGI.unescape(email_text_parts(register_email).first.body.match(confirm_regex)[1])

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


@@ -956,11 +937,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page

-    get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
+    get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }

     assert_response :success
     assert_template "confirmations/confirm"
 
     assert_response :success
     assert_template "confirmations/confirm"
 

-    post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
+    post "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }

     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success


@@ -975,7 +956,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     OmniAuth.config.add_mock(:wikipedia, :uid => "123454321", :info => { "email" => new_email })
 
     assert_difference("User.count") do
     OmniAuth.config.add_mock(:wikipedia, :uid => "123454321", :info => { "email" => new_email })
 
     assert_difference("User.count") do

-      assert_difference("ActionMailer::Base.deliveries.size", 1) do
+      assert_no_difference("ActionMailer::Base.deliveries.size") do

         perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email,
         perform_enqueued_jobs do
           post "/user/new",
                :params => { :user => { :email => new_email,


@@ -984,13 +965,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :auth_provider => "wikipedia",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }
                                        :auth_provider => "wikipedia",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }

-          assert_response :redirect

           assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new")
           post response.location
           assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new")
           post response.location

-          assert_response :redirect

           assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new")
           follow_redirect!
           assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new")
           follow_redirect!

-          assert_response :redirect

           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,
           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,


@@ -1002,8 +980,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :pass_crypt_confirmation => password },
                             :read_ct => 1,
                             :read_tou => 1 }
                                        :pass_crypt_confirmation => password },
                             :read_ct => 1,
                             :read_tou => 1 }

-          assert_response :redirect
-          assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name
+          assert_redirected_to welcome_path

           follow_redirect!
         end
       end
           follow_redirect!
         end
       end


@@ -1011,7 +988,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     # Check the page
     assert_response :success
 
     # Check the page
     assert_response :success

-    assert_template "confirmations/confirm"
+    assert_template "site/welcome"

 
     ActionMailer::Base.deliveries.clear
   end
 
     ActionMailer::Base.deliveries.clear
   end


@@ -1031,13 +1008,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :auth_provider => "wikipedia",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }
                                        :auth_provider => "wikipedia",
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" } }

-          assert_response :redirect

           assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new")
           post response.location
           assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new")
           post response.location

-          assert_response :redirect

           assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new")
           follow_redirect!
           assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new")
           follow_redirect!

-          assert_response :redirect

           assert_redirected_to auth_failure_path(:strategy => "wikipedia", :message => "connection_failed", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect
           assert_redirected_to auth_failure_path(:strategy => "wikipedia", :message => "connection_failed", :origin => "/user/new")
           follow_redirect!
           assert_response :redirect


@@ -1069,13 +1043,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" },
                             :referer => referer }
                                        :pass_crypt => "",
                                        :pass_crypt_confirmation => "" },
                             :referer => referer }

-          assert_response :redirect

           assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new")
           post response.location
           assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new")
           post response.location

-          assert_response :redirect

           assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new")
           follow_redirect!
           assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new")
           follow_redirect!

-          assert_response :redirect

           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,
           assert_redirected_to "/user/terms"
           post "/user/save",
                :params => { :user => { :email => new_email,


@@ -1097,11 +1068,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct
 
     assert_equal register_email.to.first, new_email
     # Check that the confirm account url is correct

-    confirm_regex = Regexp.new("/user/redirect_tester_wikipedia/confirm\\?confirm_string=([a-zA-Z0-9_-]*)")
+    confirm_regex = Regexp.new("confirm_string=([a-zA-Z0-9%_-]*)")

     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end
     email_text_parts(register_email).each do |part|
       assert_match confirm_regex, part.body.to_s
     end

-    confirm_string = email_text_parts(register_email).first.body.match(confirm_regex)[1]
+    confirm_string = CGI.unescape(email_text_parts(register_email).first.body.match(confirm_regex)[1])

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


@@ -1110,11 +1081,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page

-    get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
+    get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }

     assert_response :success
     assert_template "confirmations/confirm"
 
     assert_response :success
     assert_template "confirmations/confirm"
 

-    post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string }
+    post "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string }

     assert_response :redirect
     follow_redirect!
     assert_response :success
     assert_response :redirect
     follow_redirect!
     assert_response :success