X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dbd88d893f3c3fce9cafd666b94396988646d81f..93a57af6aacdbc48ec5e24b3770fe6c1537f656a:/test/integration/user_creation_test.rb?ds=inline diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb index 20ee9a885..8b6b3ef3c 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -27,25 +27,31 @@ class UserCreationTest < ActionDispatch::IntegrationTest get "/user/new", :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s } follow_redirect! assert_response :success - assert_template "user/new" + assert_template "users/new" end 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 - 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 } + 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 end assert_response :success - assert_template "user/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_template "users/new" + assert_equal locale.to_s, response.headers["Content-Language"] + assert_select "form > fieldset > div.standard-form-row > input.field_with_errors#user_email" assert_no_missing_translations end end @@ -56,14 +62,20 @@ class UserCreationTest < ActionDispatch::IntegrationTest email = "#{locale}_new_tester" assert_difference("User.count", 0) do assert_difference("ActionMailer::Base.deliveries.size", 0) 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 } + 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 end assert_response :success - assert_template "user/new" - assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name" + assert_template "users/new" + assert_select "form > fieldset > div.standard-form-row > input.field_with_errors#user_display_name" assert_no_missing_translations end end @@ -75,8 +87,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("User.count", 0) do assert_difference("ActionMailer::Base.deliveries.size", 0) do - post "/user/new", - :params => { :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } } + 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 @@ -84,9 +102,12 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) do - post "/user/save", - :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s } - follow_redirect! + 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 end @@ -95,18 +116,48 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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_match(/#{@url}/, register_email.body.to_s) # Check the page assert_response :success - assert_template "user/confirm" + assert_template "users/confirm" + + ActionMailer::Base.deliveries.clear + end + 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 + 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 ActionMailer::Base.deliveries.clear end 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 @@ -122,12 +173,24 @@ class UserCreationTest < ActionDispatch::IntegrationTest referer = "/traces/mine" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) 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 } - 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 } } - follow_redirect! + 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 } + 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_ct => 1, :read_tou => 1 } + follow_redirect! + end end end @@ -144,14 +207,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "user/confirm" + assert_template "users/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 "user/confirm" + assert_template "users/confirm" post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :redirect @@ -168,26 +231,41 @@ class UserCreationTest < ActionDispatch::IntegrationTest password = "testtest" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) 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 => "" } } - assert_response :redirect - assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") - follow_redirect! - 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 } } - assert_response :redirect - follow_redirect! + 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 => "" } } + assert_response :redirect + assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") + follow_redirect! + 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_ct => 1, :read_tou => 1 } + assert_response :redirect + follow_redirect! + end end end # Check the page assert_response :success - assert_template "user/confirm" + assert_template "users/confirm" ActionMailer::Base.deliveries.clear end @@ -199,21 +277,29 @@ class UserCreationTest < ActionDispatch::IntegrationTest display_name = "new_tester-openid2" assert_difference("User.count", 0) do assert_difference("ActionMailer::Base.deliveries.size", 0) 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 => "" } } - assert_response :redirect - assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") - follow_redirect! - 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 - follow_redirect! - assert_response :success - assert_template "user/new" + 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 => "" } } + assert_response :redirect + assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") + follow_redirect! + 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 + follow_redirect! + assert_response :success + assert_template "users/new" + end end end @@ -229,19 +315,35 @@ class UserCreationTest < ActionDispatch::IntegrationTest referer = "/traces/mine" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) 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 } - assert_response :redirect - assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") - follow_redirect! - 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" } } - follow_redirect! + 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 } + assert_response :redirect + assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") + follow_redirect! + 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_ct => 1, :read_tou => 1 } + follow_redirect! + end end end @@ -258,14 +360,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "user/confirm" + assert_template "users/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 "user/confirm" + assert_template "users/confirm" post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :redirect @@ -284,26 +386,40 @@ class UserCreationTest < ActionDispatch::IntegrationTest password = "testtest" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) 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 => "" } } - assert_response :redirect - assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") - follow_redirect! - 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 } } - assert_response :redirect - follow_redirect! + 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 => "" } } + assert_response :redirect + assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") + follow_redirect! + 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_ct => 1, :read_tou => 1 } + assert_response :redirect + follow_redirect! + end end end # Check the page assert_response :success - assert_template "user/confirm" + assert_template "users/confirm" ActionMailer::Base.deliveries.clear end @@ -315,21 +431,28 @@ class UserCreationTest < ActionDispatch::IntegrationTest display_name = "new_tester-google2" assert_difference("User.count", 0) do assert_difference("ActionMailer::Base.deliveries.size", 0) 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 => "" } } - assert_response :redirect - assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") - follow_redirect! - 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 - follow_redirect! - assert_response :success - assert_template "user/new" + 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 => "" } } + assert_response :redirect + assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") + follow_redirect! + 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 + follow_redirect! + assert_response :success + assert_template "users/new" + end end end @@ -347,19 +470,34 @@ class UserCreationTest < ActionDispatch::IntegrationTest referer = "/traces/mine" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) 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 } - assert_response :redirect - assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") - follow_redirect! - 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" } } - follow_redirect! + 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 } + assert_response :redirect + assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") + follow_redirect! + 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_ct => 1, :read_tou => 1 } + follow_redirect! + end end end @@ -376,14 +514,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "user/confirm" + assert_template "users/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 "user/confirm" + assert_template "users/confirm" post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :redirect @@ -400,26 +538,40 @@ class UserCreationTest < ActionDispatch::IntegrationTest password = "testtest" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) 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 => "" } } - assert_response :redirect - assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") - follow_redirect! - 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 } } - assert_response :redirect - follow_redirect! + 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 => "" } } + assert_response :redirect + assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") + follow_redirect! + 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_ct => 1, :read_tou => 1 } + assert_response :redirect + follow_redirect! + end end end # Check the page assert_response :success - assert_template "user/confirm" + assert_template "users/confirm" ActionMailer::Base.deliveries.clear end @@ -431,21 +583,28 @@ class UserCreationTest < ActionDispatch::IntegrationTest display_name = "new_tester-facebook2" assert_difference("User.count", 0) do assert_difference("ActionMailer::Base.deliveries.size", 0) 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 => "" } } - assert_response :redirect - assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") - follow_redirect! - 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 - follow_redirect! - assert_response :success - assert_template "user/new" + 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 => "" } } + assert_response :redirect + assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") + follow_redirect! + 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 + follow_redirect! + assert_response :success + assert_template "users/new" + end end end @@ -461,19 +620,34 @@ class UserCreationTest < ActionDispatch::IntegrationTest referer = "/traces/mine" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) 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 } - assert_response :redirect - assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") - follow_redirect! - 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" } } - follow_redirect! + 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 } + assert_response :redirect + assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") + follow_redirect! + 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_ct => 1, :read_tou => 1 } + follow_redirect! + end end end @@ -490,14 +664,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "user/confirm" + assert_template "users/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 "user/confirm" + assert_template "users/confirm" post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :redirect @@ -514,26 +688,40 @@ class UserCreationTest < ActionDispatch::IntegrationTest password = "testtest" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) 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 => "" } } - assert_response :redirect - assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new") - follow_redirect! - 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 } } - assert_response :redirect - follow_redirect! + 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 => "" } } + assert_response :redirect + assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new") + follow_redirect! + 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_ct => 1, :read_tou => 1 } + assert_response :redirect + follow_redirect! + end end end # Check the page assert_response :success - assert_template "user/confirm" + assert_template "users/confirm" ActionMailer::Base.deliveries.clear end @@ -545,21 +733,28 @@ class UserCreationTest < ActionDispatch::IntegrationTest display_name = "new_tester-windowslive2" assert_difference("User.count", 0) do assert_difference("ActionMailer::Base.deliveries.size", 0) 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 => "" } } - assert_response :redirect - assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new") - follow_redirect! - assert_response :redirect - assert_redirected_to auth_success_path(:provider => "windowslive") - follow_redirect! - assert_response :redirect - assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "connection_failed", :origin => "/user/new") - follow_redirect! - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "user/new" + 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 => "" } } + assert_response :redirect + assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new") + follow_redirect! + assert_response :redirect + assert_redirected_to auth_success_path(:provider => "windowslive") + follow_redirect! + assert_response :redirect + assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "connection_failed", :origin => "/user/new") + follow_redirect! + assert_response :redirect + follow_redirect! + assert_response :success + assert_template "users/new" + end end end @@ -575,19 +770,34 @@ class UserCreationTest < ActionDispatch::IntegrationTest referer = "/traces/mine" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) 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 } - assert_response :redirect - assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new") - follow_redirect! - 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" } } - follow_redirect! + 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 } + assert_response :redirect + assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new") + follow_redirect! + 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_ct => 1, :read_tou => 1 } + follow_redirect! + end end end @@ -604,14 +814,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "user/confirm" + assert_template "users/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 "user/confirm" + assert_template "users/confirm" post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :redirect @@ -628,26 +838,41 @@ class UserCreationTest < ActionDispatch::IntegrationTest password = "testtest" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) 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 => "" } } - assert_response :redirect - assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") - follow_redirect! - 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 } } - assert_response :redirect - follow_redirect! + 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 => "" } } + assert_response :redirect + assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") + follow_redirect! + 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_ct => 1, + :read_tou => 1 } + assert_response :redirect + follow_redirect! + end end end # Check the page assert_response :success - assert_template "user/confirm" + assert_template "users/confirm" ActionMailer::Base.deliveries.clear end @@ -659,21 +884,28 @@ class UserCreationTest < ActionDispatch::IntegrationTest display_name = "new_tester-github2" assert_difference("User.count", 0) do assert_difference("ActionMailer::Base.deliveries.size", 0) 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 => "" } } - assert_response :redirect - assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") - follow_redirect! - 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 - follow_redirect! - assert_response :success - assert_template "user/new" + 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 => "" } } + assert_response :redirect + assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") + follow_redirect! + 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 + follow_redirect! + assert_response :success + assert_template "users/new" + end end end @@ -689,19 +921,35 @@ class UserCreationTest < ActionDispatch::IntegrationTest referer = "/traces/mine" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) 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 } - assert_response :redirect - assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") - follow_redirect! - 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" } } - follow_redirect! + 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 } + assert_response :redirect + assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") + follow_redirect! + 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_ct => 1, + :read_tou => 1 } + follow_redirect! + end end end @@ -718,14 +966,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "user/confirm" + assert_template "users/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 "user/confirm" + assert_template "users/confirm" post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :redirect @@ -742,26 +990,41 @@ class UserCreationTest < ActionDispatch::IntegrationTest password = "testtest" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) 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 => "" } } - assert_response :redirect - assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") - follow_redirect! - 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 } } - assert_response :redirect - follow_redirect! + 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 => "" } } + assert_response :redirect + assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") + follow_redirect! + 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_ct => 1, + :read_tou => 1 } + assert_response :redirect + follow_redirect! + end end end # Check the page assert_response :success - assert_template "user/confirm" + assert_template "users/confirm" ActionMailer::Base.deliveries.clear end @@ -773,21 +1036,28 @@ class UserCreationTest < ActionDispatch::IntegrationTest display_name = "new_tester-wikipedia2" assert_difference("User.count", 0) do assert_difference("ActionMailer::Base.deliveries.size", 0) 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 => "" } } - assert_response :redirect - assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") - follow_redirect! - 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 - follow_redirect! - assert_response :success - assert_template "user/new" + 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 => "" } } + assert_response :redirect + assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") + follow_redirect! + 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 + follow_redirect! + assert_response :success + assert_template "users/new" + end end end @@ -803,19 +1073,35 @@ class UserCreationTest < ActionDispatch::IntegrationTest referer = "/traces/mine" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) 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 } - assert_response :redirect - assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") - follow_redirect! - 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" } } - follow_redirect! + 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 } + assert_response :redirect + assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") + follow_redirect! + 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_ct => 1, + :read_tou => 1 } + follow_redirect! + end end end @@ -832,14 +1118,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "user/confirm" + assert_template "users/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 "user/confirm" + assert_template "users/confirm" post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :redirect