X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/77797b21b0701654f9a7ee57aace7fa16214e9c2..bde2faac581d7c16582e1012ba036f8c535773f2:/test/integration/user_creation_test.rb diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb index 21e751bca..1f749f957 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -18,149 +18,151 @@ class UserCreationTest < ActionDispatch::IntegrationTest end def test_create_user_form - I18n.with_locale "en" do - I18n.available_locales.each do |locale| - reset! - get "/user/new", :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s } - follow_redirect! - assert_response :success - assert_template "users/new" - end - end + get "/user/new" + follow_redirect! + assert_response :success + assert_template "users/new" end def test_user_create_submit_duplicate_email - I18n.with_locale "en" do - Locale.available.each do |locale| - dup_email = create(:user).email - display_name = "#{locale}_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 => dup_email, - :email_confirmation => dup_email, - :display_name => display_name, - :pass_crypt => "testtest", - :pass_crypt_confirmation => "testtest" } }, - :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s } - end - end + dup_email = create(:user).email + 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 => dup_email, + :email_confirmation => dup_email, + :display_name => display_name, + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" } } end - assert_response :success - assert_template "users/new" - assert_equal locale.to_s, response.headers["Content-Language"] - assert_select "form" - assert_select "form > div > input.is-invalid#user_email" - assert_no_missing_translations end end + assert_response :success + assert_template "users/new" + assert_select "form" + assert_select "form > div > input.is-invalid#user_email" end def test_user_create_submit_duplicate_username - I18n.with_locale "en" do - I18n.available_locales.each do |locale| - dup_display_name = create(:user).display_name - email = "#{locale}_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 => dup_display_name, - :pass_crypt => "testtest", - :pass_crypt_confirmation => "testtest" } }, - :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s } - end - end + dup_display_name = create(:user).display_name + email = "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 => dup_display_name, + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" } } + end + end + end + assert_response :success + assert_template "users/new" + 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 - assert_response :success - assert_template "users/new" - assert_select "form > div > input.is-invalid#user_display_name" - assert_no_missing_translations 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 - I18n.with_locale "en" do - I18n.available_locales.each do |locale| - new_email = "#{locale}newtester@osm.org" - display_name = "#{locale}_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 => new_email, - :email_confirmation => new_email, - :display_name => display_name, - :pass_crypt => "testtest", - :pass_crypt_confirmation => "testtest" } } - end - end + new_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 => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" } } end + end + end + + assert_redirected_to "/user/terms" - assert_redirected_to "/user/terms" - - assert_difference("User.count") do - assert_difference("ActionMailer::Base.deliveries.size", 1) do - perform_enqueued_jobs do - post "/user/save", - :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }, - :params => { :read_ct => 1, :read_tou => 1 } - follow_redirect! - end - end + assert_difference("User.count") do + assert_difference("ActionMailer::Base.deliveries.size", 1) do + perform_enqueued_jobs do + post "/user/save", + :params => { :read_ct => 1, :read_tou => 1 } + follow_redirect! end + end + end - # Check the e-mail - register_email = ActionMailer::Base.deliveries.first + assert_response :success + assert_template "confirmations/confirm" - assert_equal register_email.to.first, new_email - # Check that the confirm account url is correct - assert_match(/#{@url}/, register_email.body.to_s) + user = User.find_by(:email => "newtester@osm.org") + assert_not_nil user + assert_not_predicate user, :active? - # Check the page - assert_response :success - assert_template "confirmations/confirm" + 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 - end - end + 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 - I18n.with_locale "en" do - I18n.available_locales.each do |locale| - new_email = "#{locale}newtester@osm.org" - display_name = "#{locale}_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 => new_email, - :email_confirmation => new_email, - :display_name => display_name, - :pass_crypt => "testtest", - :pass_crypt_confirmation => "testtest" } } - end - end - end - - assert_redirected_to "/user/terms" + new_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/save", - :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s } - assert_redirected_to "/user/terms" + post "/user/new", + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" } } end - - ActionMailer::Base.deliveries.clear end end + + assert_redirected_to "/user/terms" + + perform_enqueued_jobs do + post "/user/save" + assert_redirected_to "/user/terms" + end + + ActionMailer::Base.deliveries.clear end # Check that the user can successfully recover their password @@ -206,11 +208,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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 - 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 @@ -219,11 +221,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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" - 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 @@ -247,13 +249,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :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_response :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, @@ -293,13 +292,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :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_response :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 @@ -332,13 +328,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :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_response :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, @@ -359,11 +352,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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 - 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 @@ -372,11 +365,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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" - 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 @@ -400,13 +393,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :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_response :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, @@ -417,7 +407,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt => password, :pass_crypt_confirmation => password }, :read_ct => 1, :read_tou => 1 } - assert_response :redirect assert_redirected_to welcome_path follow_redirect! end @@ -446,13 +435,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :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_response :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 @@ -486,13 +472,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } - assert_response :redirect 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_response :redirect assert_redirected_to "/user/terms" post "/user/save", :params => { :user => { :email => new_email, @@ -513,11 +496,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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 - 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 @@ -526,11 +509,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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" - 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 @@ -554,13 +537,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :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_response :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, @@ -571,7 +551,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt => password, :pass_crypt_confirmation => password }, :read_ct => 1, :read_tou => 1 } - assert_response :redirect assert_redirected_to welcome_path follow_redirect! end @@ -600,13 +579,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :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_response :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 @@ -638,13 +614,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } - assert_response :redirect 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_response :redirect assert_redirected_to "/user/terms" post "/user/save", :params => { :user => { :email => new_email, @@ -665,11 +638,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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 - 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 @@ -678,11 +651,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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" - 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 @@ -706,13 +679,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :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_response :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, @@ -723,7 +693,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt => password, :pass_crypt_confirmation => password }, :read_ct => 1, :read_tou => 1 } - assert_response :redirect assert_redirected_to welcome_path follow_redirect! end @@ -752,13 +721,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :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_response :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 @@ -790,13 +756,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } - assert_response :redirect 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_response :redirect assert_redirected_to "/user/terms" post "/user/save", :params => { :user => { :email => new_email, @@ -817,11 +780,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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 - 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 @@ -830,11 +793,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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" - 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 @@ -849,7 +812,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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, @@ -858,13 +821,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :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_response :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, @@ -876,8 +836,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :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 @@ -885,7 +844,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "confirmations/confirm" + assert_template "site/welcome" ActionMailer::Base.deliveries.clear end @@ -905,13 +864,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :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_response :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 @@ -943,13 +899,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } - assert_response :redirect 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_response :redirect assert_redirected_to "/user/terms" post "/user/save", :params => { :user => { :email => new_email, @@ -971,11 +924,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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 - 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 @@ -984,11 +937,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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" - 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 @@ -1003,7 +956,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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, @@ -1012,13 +965,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :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_response :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, @@ -1030,8 +980,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :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 @@ -1039,7 +988,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "confirmations/confirm" + assert_template "site/welcome" ActionMailer::Base.deliveries.clear end @@ -1059,13 +1008,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :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_response :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 @@ -1097,13 +1043,10 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } - assert_response :redirect 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_response :redirect assert_redirected_to "/user/terms" post "/user/save", :params => { :user => { :email => new_email, @@ -1125,11 +1068,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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 - 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 @@ -1138,11 +1081,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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" - 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