X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/90c5d95ac4c19ab68fc9e0cdfb570b0251f03ee4..7d52cafd84843cf9fddc30471face0559b288fa7:/test/integration/user_creation_test.rb diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb index f331a4b98..8ec0dc9bc 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -2,159 +2,137 @@ require "test_helper" class UserCreationTest < ActionDispatch::IntegrationTest def setup - I18n.locale = "en" - OmniAuth.config.test_mode = true stub_request(:get, /.*gravatar.com.*d=404/).to_return(:status => 404) end def teardown - I18n.locale = "en" - OmniAuth.config.mock_auth[:openid] = nil OmniAuth.config.mock_auth[:google] = nil OmniAuth.config.mock_auth[:facebook] = nil - OmniAuth.config.mock_auth[:windowslive] = nil + OmniAuth.config.mock_auth[:microsoft] = nil OmniAuth.config.mock_auth[:github] = nil OmniAuth.config.mock_auth[:wikipedia] = nil OmniAuth.config.test_mode = false end def test_create_user_form - 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 + get "/user/new" + follow_redirect! + assert_response :success + assert_template "users/new" end def test_user_create_submit_duplicate_email - 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 + 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 end - assert_response :success - assert_template "users/new" - assert_equal locale.to_s, response.headers["Content-Language"] - assert_select "form" - assert_select "form > div.form-group > input.is-invalid#user_email" - assert_no_missing_translations 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.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 + 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 - assert_response :success - assert_template "users/new" - assert_select "form > div.form-group > input.is-invalid#user_display_name" - assert_no_missing_translations end + assert_response :success + assert_template "users/new" + assert_select "form > div > input.is-invalid#user_display_name" end def test_user_create_success - 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 + 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 + 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 + # 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) + 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 "users/confirm" + # Check the page + assert_response :success + assert_template "confirmations/confirm" - ActionMailer::Base.deliveries.clear - end + ActionMailer::Base.deliveries.clear end def test_user_create_no_tou_failure - 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 + 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" - - perform_enqueued_jobs do - post "/user/save", - :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s } - assert_redirected_to "/user/terms" - end + assert_redirected_to "/user/terms" - ActionMailer::Base.deliveries.clear + 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 @@ -200,7 +178,7 @@ 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("/user/redirect_tester/confirm\\?confirm_string=([a-zA-Z0-9_-]*)") email_text_parts(register_email).each do |part| assert_match confirm_regex, part.body.to_s end @@ -208,14 +186,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" ActionMailer::Base.deliveries.clear # Go to the confirmation page get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :redirect @@ -243,7 +221,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") - follow_redirect! + 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! @@ -266,7 +244,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" ActionMailer::Base.deliveries.clear end @@ -289,7 +267,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") - follow_redirect! + 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! @@ -328,7 +306,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :referer => referer } assert_response :redirect assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") - follow_redirect! + 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! @@ -353,7 +331,7 @@ 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("/user/redirect_tester_openid/confirm\\?confirm_string=([a-zA-Z0-9_-]*)") email_text_parts(register_email).each do |part| assert_match confirm_regex, part.body.to_s end @@ -361,14 +339,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" ActionMailer::Base.deliveries.clear # Go to the confirmation page get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :redirect @@ -378,15 +356,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest end def test_user_create_google_success - OmniAuth.config.add_mock(:google, :uid => "123454321", :extra => { - :id_info => { "openid_id" => "http://localhost:1123/new.tester" } - }) - new_email = "newtester-google@osm.org" display_name = "new_tester-google" password = "testtest" + + OmniAuth.config.add_mock(:google, :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, @@ -397,7 +374,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! @@ -413,6 +390,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => password }, :read_ct => 1, :read_tou => 1 } assert_response :redirect + assert_redirected_to welcome_path follow_redirect! end end @@ -420,7 +398,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "users/confirm" + assert_template "site/welcome" ActionMailer::Base.deliveries.clear end @@ -442,7 +420,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! @@ -482,7 +460,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :referer => referer } assert_response :redirect assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! @@ -507,7 +485,7 @@ 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("/user/redirect_tester_google/confirm\\?confirm_string=([a-zA-Z0-9_-]*)") email_text_parts(register_email).each do |part| assert_match confirm_regex, part.body.to_s end @@ -515,14 +493,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" ActionMailer::Base.deliveries.clear # Go to the confirmation page get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :redirect @@ -532,13 +510,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest end def test_user_create_facebook_success - OmniAuth.config.add_mock(:facebook, :uid => "123454321") - new_email = "newtester-facebook@osm.org" display_name = "new_tester-facebook" password = "testtest" + + OmniAuth.config.add_mock(:facebook, :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, @@ -549,7 +528,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "facebook") follow_redirect! @@ -565,6 +544,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => password }, :read_ct => 1, :read_tou => 1 } assert_response :redirect + assert_redirected_to welcome_path follow_redirect! end end @@ -572,7 +552,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "users/confirm" + assert_template "site/welcome" ActionMailer::Base.deliveries.clear end @@ -594,7 +574,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "facebook") follow_redirect! @@ -632,7 +612,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :referer => referer } assert_response :redirect assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "facebook") follow_redirect! @@ -657,7 +637,7 @@ 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("/user/redirect_tester_facebook/confirm\\?confirm_string=([a-zA-Z0-9_-]*)") email_text_parts(register_email).each do |part| assert_match confirm_regex, part.body.to_s end @@ -665,14 +645,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" ActionMailer::Base.deliveries.clear # Go to the confirmation page get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :redirect @@ -681,27 +661,28 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_template "site/welcome" end - def test_user_create_windowslive_success - OmniAuth.config.add_mock(:windowslive, :uid => "123454321") - - new_email = "newtester-windowslive@osm.org" - display_name = "new_tester-windowslive" + def test_user_create_microsoft_success + new_email = "newtester-microsoft@osm.org" + display_name = "new_tester-microsoft" password = "testtest" + + OmniAuth.config.add_mock(:microsoft, :uid => "123454321", :info => { "email" => new_email }) + assert_difference("User.count") do - assert_difference("ActionMailer::Base.deliveries.size", 1) 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, - :auth_provider => "windowslive", + :auth_provider => "microsoft", :pass_crypt => "", :pass_crypt_confirmation => "" } } assert_response :redirect - assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new") - follow_redirect! + assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new") + post response.location assert_response :redirect - assert_redirected_to auth_success_path(:provider => "windowslive") + assert_redirected_to auth_success_path(:provider => "microsoft") follow_redirect! assert_response :redirect assert_redirected_to "/user/terms" @@ -709,12 +690,13 @@ class UserCreationTest < ActionDispatch::IntegrationTest :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, - :auth_provider => "windowslive", + :auth_provider => "microsoft", :auth_uid => "123454321", :pass_crypt => password, :pass_crypt_confirmation => password }, :read_ct => 1, :read_tou => 1 } assert_response :redirect + assert_redirected_to welcome_path follow_redirect! end end @@ -722,16 +704,16 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "users/confirm" + assert_template "site/welcome" ActionMailer::Base.deliveries.clear end - def test_user_create_windowslive_failure - OmniAuth.config.mock_auth[:windowslive] = :connection_failed + def test_user_create_microsoft_failure + OmniAuth.config.mock_auth[:microsoft] = :connection_failed - new_email = "newtester-windowslive2@osm.org" - display_name = "new_tester-windowslive2" + new_email = "newtester-microsoft2@osm.org" + display_name = "new_tester-microsoft2" assert_difference("User.count", 0) do assert_difference("ActionMailer::Base.deliveries.size", 0) do perform_enqueued_jobs do @@ -739,17 +721,17 @@ class UserCreationTest < ActionDispatch::IntegrationTest :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, - :auth_provider => "windowslive", + :auth_provider => "microsoft", :pass_crypt => "", :pass_crypt_confirmation => "" } } assert_response :redirect - assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new") - follow_redirect! + assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new") + post response.location assert_response :redirect - assert_redirected_to auth_success_path(:provider => "windowslive") + assert_redirected_to auth_success_path(:provider => "microsoft") follow_redirect! assert_response :redirect - assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "connection_failed", :origin => "/user/new") + assert_redirected_to auth_failure_path(:strategy => "microsoft", :message => "connection_failed", :origin => "/user/new") follow_redirect! assert_response :redirect follow_redirect! @@ -762,11 +744,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest ActionMailer::Base.deliveries.clear end - def test_user_create_windowslive_redirect - OmniAuth.config.add_mock(:windowslive, :uid => "123454321") + def test_user_create_microsoft_redirect + OmniAuth.config.add_mock(:microsoft, :uid => "123454321") - new_email = "redirect_tester_windowslive@osm.org" - display_name = "redirect_tester_windowslive" + new_email = "redirect_tester_microsoft@osm.org" + display_name = "redirect_tester_microsoft" # nothing special about this page, just need a protected page to redirect back to. referer = "/traces/mine" assert_difference("User.count") do @@ -776,15 +758,15 @@ class UserCreationTest < ActionDispatch::IntegrationTest :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, - :auth_provider => "windowslive", + :auth_provider => "microsoft", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } assert_response :redirect - assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new") - follow_redirect! + assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new") + post response.location assert_response :redirect - assert_redirected_to auth_success_path(:provider => "windowslive") + assert_redirected_to auth_success_path(:provider => "microsoft") follow_redirect! assert_response :redirect assert_redirected_to "/user/terms" @@ -792,7 +774,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, - :auth_provider => "windowslive", + :auth_provider => "microsoft", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }, @@ -807,7 +789,7 @@ 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_windowslive/confirm\\?confirm_string=([a-zA-Z0-9]*)") + confirm_regex = Regexp.new("/user/redirect_tester_microsoft/confirm\\?confirm_string=([a-zA-Z0-9_-]*)") email_text_parts(register_email).each do |part| assert_match confirm_regex, part.body.to_s end @@ -815,14 +797,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" ActionMailer::Base.deliveries.clear # Go to the confirmation page get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :redirect @@ -832,11 +814,12 @@ class UserCreationTest < ActionDispatch::IntegrationTest end def test_user_create_github_success - OmniAuth.config.add_mock(:github, :uid => "123454321") - new_email = "newtester-github@osm.org" display_name = "new_tester-github" password = "testtest" + + OmniAuth.config.add_mock(:github, :uid => "123454321", :info => { "email" => new_email }) + assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do @@ -849,7 +832,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "github") follow_redirect! @@ -866,6 +849,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :read_ct => 1, :read_tou => 1 } assert_response :redirect + assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name follow_redirect! end end @@ -873,7 +857,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" ActionMailer::Base.deliveries.clear end @@ -895,7 +879,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "github") follow_redirect! @@ -933,7 +917,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :referer => referer } assert_response :redirect assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "github") follow_redirect! @@ -959,7 +943,7 @@ 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("/user/redirect_tester_github/confirm\\?confirm_string=([a-zA-Z0-9_-]*)") email_text_parts(register_email).each do |part| assert_match confirm_regex, part.body.to_s end @@ -967,14 +951,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" ActionMailer::Base.deliveries.clear # Go to the confirmation page get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :redirect @@ -984,11 +968,12 @@ class UserCreationTest < ActionDispatch::IntegrationTest end def test_user_create_wikipedia_success - OmniAuth.config.add_mock(:wikipedia, :uid => "123454321") - new_email = "newtester-wikipedia@osm.org" display_name = "new_tester-wikipedia" password = "testtest" + + OmniAuth.config.add_mock(:wikipedia, :uid => "123454321", :info => { "email" => new_email }) + assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do @@ -1001,7 +986,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new") follow_redirect! @@ -1018,6 +1003,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :read_ct => 1, :read_tou => 1 } assert_response :redirect + assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name follow_redirect! end end @@ -1025,7 +1011,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" ActionMailer::Base.deliveries.clear end @@ -1047,7 +1033,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new") follow_redirect! @@ -1085,7 +1071,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :referer => referer } assert_response :redirect assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new") follow_redirect! @@ -1111,7 +1097,7 @@ 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("/user/redirect_tester_wikipedia/confirm\\?confirm_string=([a-zA-Z0-9_-]*)") email_text_parts(register_email).each do |part| assert_match confirm_regex, part.body.to_s end @@ -1119,14 +1105,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" ActionMailer::Base.deliveries.clear # Go to the confirmation page get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :redirect