X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e30813bbb1fce58f29285140bfea2d52d1dc555f..c105164d7e652dec72a4bff0a47ef96540a6f5ba:/test/integration/user_creation_test.rb diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb index 3a8f4b552..a39e423c0 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -7,7 +7,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest OmniAuth.config.test_mode = true stub_request(:get, /.*gravatar.com.*d=404/).to_return(:status => 404) - stub_hostip_requests end def teardown @@ -33,22 +32,27 @@ class UserCreationTest < ActionDispatch::IntegrationTest end def test_user_create_submit_duplicate_email - I18n.available_locales.each do |locale| + 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" } }, + :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 end assert_response :success assert_template "users/new" - assert_equal locale.to_s, response.headers["Content-Language"] unless locale == :root - assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email" + 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 end @@ -61,14 +65,18 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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" } }, + :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 end assert_response :success assert_template "users/new" - assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name" + assert_select "form > div.form-group > input.is-invalid#user_display_name" assert_no_missing_translations end end @@ -82,7 +90,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" } } end end end @@ -94,7 +106,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest perform_enqueued_jobs do post "/user/save", :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }, - :params => { :read_tou => 1 } + :params => { :read_ct => 1, :read_tou => 1 } follow_redirect! end end @@ -109,7 +121,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" ActionMailer::Base.deliveries.clear end @@ -124,7 +136,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" } } end end end @@ -142,7 +158,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest end # Check that the user can successfully recover their password - def lost_password_recovery_success + def test_lost_password_recovery_success # Open the lost password form # Submit the lost password form # Check the e-mail @@ -160,10 +176,20 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password }, :referer => referer } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :pass_crypt => password, + :pass_crypt_confirmation => password }, + :referer => referer } assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password }, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :pass_crypt => password, + :pass_crypt_confirmation => password }, + :read_ct => 1, :read_tou => 1 } follow_redirect! end end @@ -182,14 +208,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 @@ -208,17 +234,30 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "openid", + :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") - 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! assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => password, :pass_crypt_confirmation => password }, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "openid", + :auth_uid => "http://localhost:1123/new.tester", + :pass_crypt => password, + :pass_crypt_confirmation => password }, + :read_ct => 1, :read_tou => 1 } assert_response :redirect follow_redirect! end @@ -227,7 +266,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" ActionMailer::Base.deliveries.clear end @@ -241,10 +280,16 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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 => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "openid", + :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") - 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! @@ -273,17 +318,31 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "openid", + :auth_uid => "http://localhost:1123/new.tester", + :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") - 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! assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "openid", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "openid", + :auth_uid => "http://localhost:1123/new.tester", + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" }, + :read_ct => 1, :read_tou => 1 } follow_redirect! end end @@ -302,14 +361,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 @@ -330,17 +389,29 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "google", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "google", + :pass_crypt => "", + :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! assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "google", :auth_uid => "123454321", :pass_crypt => password, :pass_crypt_confirmation => password }, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "google", + :auth_uid => "123454321", + :pass_crypt => password, + :pass_crypt_confirmation => password }, + :read_ct => 1, :read_tou => 1 } assert_response :redirect follow_redirect! end @@ -349,7 +420,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" ActionMailer::Base.deliveries.clear end @@ -363,10 +434,15 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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 => "google", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "google", + :pass_crypt => "", + :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! @@ -397,17 +473,30 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "google", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "google", + :pass_crypt => "", + :pass_crypt_confirmation => "" }, + :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! assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "google", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "google", + :auth_uid => "http://localhost:1123/new.tester", + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" }, + :read_ct => 1, :read_tou => 1 } follow_redirect! end end @@ -426,14 +515,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 @@ -452,17 +541,29 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "facebook", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "facebook", + :pass_crypt => "", + :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! assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "facebook", :auth_uid => "123454321", :pass_crypt => password, :pass_crypt_confirmation => password }, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "facebook", + :auth_uid => "123454321", + :pass_crypt => password, + :pass_crypt_confirmation => password }, + :read_ct => 1, :read_tou => 1 } assert_response :redirect follow_redirect! end @@ -471,7 +572,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" ActionMailer::Base.deliveries.clear end @@ -485,10 +586,15 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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 => "facebook", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "facebook", + :pass_crypt => "", + :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! @@ -517,17 +623,30 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "facebook", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "facebook", + :pass_crypt => "", + :pass_crypt_confirmation => "" }, + :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! assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "facebook", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "facebook", + :auth_uid => "http://localhost:1123/new.tester", + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" }, + :read_ct => 1, :read_tou => 1 } follow_redirect! end end @@ -546,14 +665,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 @@ -572,17 +691,29 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "windowslive", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "windowslive", + :pass_crypt => "", + :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "windowslive") follow_redirect! assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "windowslive", :auth_uid => "123454321", :pass_crypt => password, :pass_crypt_confirmation => password }, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "windowslive", + :auth_uid => "123454321", + :pass_crypt => password, + :pass_crypt_confirmation => password }, + :read_ct => 1, :read_tou => 1 } assert_response :redirect follow_redirect! end @@ -591,7 +722,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" ActionMailer::Base.deliveries.clear end @@ -605,10 +736,15 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "windowslive", + :pass_crypt => "", + :pass_crypt_confirmation => "" } } assert_response :redirect assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "windowslive") follow_redirect! @@ -637,17 +773,30 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "windowslive", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "windowslive", + :pass_crypt => "", + :pass_crypt_confirmation => "" }, + :referer => referer } assert_response :redirect assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new") - follow_redirect! + post response.location assert_response :redirect assert_redirected_to auth_success_path(:provider => "windowslive") follow_redirect! assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "windowslive", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "windowslive", + :auth_uid => "http://localhost:1123/new.tester", + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" }, + :read_ct => 1, :read_tou => 1 } follow_redirect! end end @@ -666,14 +815,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 @@ -692,17 +841,30 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "github", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "github", + :pass_crypt => "", + :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! assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "github", :auth_uid => "123454321", :pass_crypt => password, :pass_crypt_confirmation => password }, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "github", + :auth_uid => "123454321", + :pass_crypt => password, + :pass_crypt_confirmation => password }, + :read_ct => 1, + :read_tou => 1 } assert_response :redirect follow_redirect! end @@ -711,7 +873,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" ActionMailer::Base.deliveries.clear end @@ -725,10 +887,15 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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 => "github", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "github", + :pass_crypt => "", + :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! @@ -757,17 +924,31 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "github", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "github", + :pass_crypt => "", + :pass_crypt_confirmation => "" }, + :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! assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "github", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "github", + :auth_uid => "http://localhost:1123/new.tester", + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" }, + :read_ct => 1, + :read_tou => 1 } follow_redirect! end end @@ -786,14 +967,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 @@ -812,17 +993,30 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "wikipedia", + :pass_crypt => "", + :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! assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :auth_uid => "123454321", :pass_crypt => password, :pass_crypt_confirmation => password }, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "wikipedia", + :auth_uid => "123454321", + :pass_crypt => password, + :pass_crypt_confirmation => password }, + :read_ct => 1, + :read_tou => 1 } assert_response :redirect follow_redirect! end @@ -831,7 +1025,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "users/confirm" + assert_template "confirmations/confirm" ActionMailer::Base.deliveries.clear end @@ -845,10 +1039,15 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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 => "wikipedia", :pass_crypt => "", :pass_crypt_confirmation => "" } } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "wikipedia", + :pass_crypt => "", + :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! @@ -877,17 +1076,31 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "wikipedia", + :pass_crypt => "", + :pass_crypt_confirmation => "" }, + :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! assert_response :redirect assert_redirected_to "/user/terms" post "/user/save", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }, :read_tou => 1 } + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "wikipedia", + :auth_uid => "http://localhost:1123/new.tester", + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" }, + :read_ct => 1, + :read_tou => 1 } follow_redirect! end end @@ -906,14 +1119,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