X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c20160d313286739fc14e89162a3afff6ccc906f..2de26d54ef22c5653f830d0ce4938df78d0ca0fd:/test/integration/user_creation_test.rb diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb index 1a53f62da..4aae1046b 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -34,8 +34,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :params => { :user => { :email => dup_email, :display_name => display_name, :pass_crypt => "testtest", - :pass_crypt_confirmation => "testtest", - :consider_pd => "1" } } + :pass_crypt_confirmation => "testtest" } } end end end @@ -57,8 +56,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest", :auth_provider => "google", - :auth_uid => "123454321", - :consider_pd => "1" } } + :auth_uid => "123454321" } } end end end @@ -97,8 +95,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :params => { :user => { :email => email, :display_name => display_name, :pass_crypt => "testtest", - :pass_crypt_confirmation => "blahblah", - :consider_pd => "1" } } + :pass_crypt_confirmation => "blahblah" } } end end end @@ -117,8 +114,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :params => { :user => { :email => email, :display_name => dup_display_name, :auth_provider => "google", - :auth_uid => "123454321", - :consider_pd => "1" } } + :auth_uid => "123454321" } } end end end @@ -138,8 +134,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :params => { :user => { :email => new_email, :display_name => display_name, :pass_crypt => "testtest", - :pass_crypt_confirmation => "testtest", - :consider_pd => "1" } } + :pass_crypt_confirmation => "testtest" } } assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name follow_redirect! end @@ -158,7 +153,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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 post confirmation_url @@ -192,8 +186,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :params => { :user => { :email => new_email, :display_name => display_name, :pass_crypt => password, - :pass_crypt_confirmation => password, - :consider_pd => "1" }, + :pass_crypt_confirmation => password }, :referer => referer } assert_response(:redirect) assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name @@ -217,8 +210,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :success assert_template "confirmations/confirm" - ActionMailer::Base.deliveries.clear - # Go to the confirmation page get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :success @@ -254,16 +245,13 @@ class UserCreationTest < ActionDispatch::IntegrationTest :params => { :user => { :email => new_email, :display_name => display_name, :auth_provider => "openid", - :auth_uid => auth_uid, - :consider_pd => "1" } } + :auth_uid => auth_uid } } end end end # Check the page assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name - - ActionMailer::Base.deliveries.clear end def test_user_create_openid_duplicate_email @@ -285,8 +273,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :success assert_template "users/new" assert_select "form > div > input.is-invalid#user_email" - - ActionMailer::Base.deliveries.clear end def test_user_create_openid_failure @@ -303,8 +289,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest end end end - - ActionMailer::Base.deliveries.clear end def test_user_create_openid_redirect @@ -330,8 +314,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :params => { :user => { :email => new_email, :display_name => display_name, :auth_provider => "openid", - :auth_uid => auth_uid, - :consider_pd => "1" } } + :auth_uid => auth_uid } } follow_redirect! end end @@ -352,8 +335,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :success assert_template "confirmations/confirm" - ActionMailer::Base.deliveries.clear - # Go to the confirmation page get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :success @@ -392,8 +373,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :params => { :user => { :email => new_email, :display_name => display_name, :auth_provider => "google", - :auth_uid => auth_uid, - :consider_pd => "1" }, + :auth_uid => auth_uid }, :email_hmac => email_hmac } assert_redirected_to welcome_path follow_redirect! @@ -404,8 +384,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success assert_template "site/welcome" - - ActionMailer::Base.deliveries.clear end def test_user_create_google_duplicate_email @@ -429,8 +407,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :success assert_template "users/new" assert_select "form > div > input.is-invalid#user_email" - - ActionMailer::Base.deliveries.clear end def test_user_create_google_failure @@ -448,8 +424,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest end end end - - ActionMailer::Base.deliveries.clear end def test_user_create_google_redirect @@ -479,8 +453,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :email_hmac => email_hmac, :display_name => display_name, :auth_provider => "google", - :auth_uid => auth_uid, - :consider_pd => "1" } } + :auth_uid => auth_uid } } assert_response :redirect follow_redirect! end @@ -502,8 +475,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :success assert_template "confirmations/confirm" - ActionMailer::Base.deliveries.clear - # Go to the confirmation page get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :success @@ -541,8 +512,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :params => { :user => { :email => new_email, :display_name => display_name, :auth_provider => "facebook", - :auth_uid => auth_uid, - :consider_pd => "1" }, + :auth_uid => auth_uid }, :email_hmac => email_hmac } assert_redirected_to welcome_path follow_redirect! @@ -553,8 +523,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success assert_template "site/welcome" - - ActionMailer::Base.deliveries.clear end def test_user_create_facebook_duplicate_email @@ -577,8 +545,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :success assert_template "users/new" assert_select "form > div > input.is-invalid#user_email" - - ActionMailer::Base.deliveries.clear end def test_user_create_facebook_failure @@ -596,8 +562,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest end end end - - ActionMailer::Base.deliveries.clear end def test_user_create_facebook_redirect @@ -628,8 +592,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :email_hmac => email_hmac, :display_name => display_name, :auth_provider => "facebook", - :auth_uid => auth_uid, - :consider_pd => "1" } } + :auth_uid => auth_uid } } assert_response :redirect follow_redirect! end @@ -651,8 +614,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :success assert_template "confirmations/confirm" - ActionMailer::Base.deliveries.clear - # Go to the confirmation page get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :success @@ -689,8 +650,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :params => { :user => { :email => new_email, :display_name => display_name, :auth_provider => "microsoft", - :auth_uid => auth_uid, - :consider_pd => "1" }, + :auth_uid => auth_uid }, :email_hmac => email_hmac } assert_redirected_to welcome_path follow_redirect! @@ -701,8 +661,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success assert_template "site/welcome" - - ActionMailer::Base.deliveries.clear end def test_user_create_microsoft_duplicate_email @@ -725,8 +683,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :success assert_template "users/new" assert_select "form > div > input.is-invalid#user_email" - - ActionMailer::Base.deliveries.clear end def test_user_create_microsoft_failure @@ -744,8 +700,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest end end end - - ActionMailer::Base.deliveries.clear end def test_user_create_microsoft_redirect @@ -775,8 +729,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :email_hmac => email_hmac, :display_name => display_name, :auth_provider => "microsoft", - :auth_uid => auth_uid, - :consider_pd => "1" } } + :auth_uid => auth_uid } } assert_response :redirect follow_redirect! end @@ -798,8 +751,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :success assert_template "confirmations/confirm" - ActionMailer::Base.deliveries.clear - # Go to the confirmation page get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :success @@ -853,8 +804,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success assert_template "site/welcome" - - ActionMailer::Base.deliveries.clear end def test_user_create_github_duplicate_email @@ -878,8 +827,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :success assert_template "users/new" assert_select "form > div > input.is-invalid#user_email" - - ActionMailer::Base.deliveries.clear end def test_user_create_github_failure @@ -896,8 +843,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest end end end - - ActionMailer::Base.deliveries.clear end def test_user_create_github_redirect @@ -926,8 +871,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :email_hmac => email_hmac, :display_name => display_name, :auth_provider => "github", - :auth_uid => auth_uid, - :consider_pd => "1" } } + :auth_uid => auth_uid } } assert_response :redirect follow_redirect! end @@ -949,8 +893,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :success assert_template "confirmations/confirm" - ActionMailer::Base.deliveries.clear - # Go to the confirmation page get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :success @@ -1025,8 +967,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :success assert_template "users/new" assert_select "form > div > input.is-invalid#user_email" - - ActionMailer::Base.deliveries.clear end def test_user_create_wikipedia_failure @@ -1044,8 +984,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest end end end - - ActionMailer::Base.deliveries.clear end def test_user_create_wikipedia_redirect @@ -1076,8 +1014,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest :email_hmac => email_hmac, :display_name => display_name, :auth_provider => "wikipedia", - :auth_uid => auth_uid, - :consider_pd => "1" } } + :auth_uid => auth_uid } } assert_response :redirect follow_redirect! end @@ -1099,8 +1036,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_response :success assert_template "confirmations/confirm" - ActionMailer::Base.deliveries.clear - # Go to the confirmation page get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :success