X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/970e1a99d7dce64f0631e88c5b9f060fb48d75fe..90c5d95ac4c19ab68fc9e0cdfb570b0251f03ee4:/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 cdf4fcfe9..f331a4b98 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -1,8 +1,6 @@ require "test_helper" class UserCreationTest < ActionDispatch::IntegrationTest - fixtures :users - def setup I18n.locale = "en" @@ -19,50 +17,66 @@ class UserCreationTest < ActionDispatch::IntegrationTest OmniAuth.config.mock_auth[:facebook] = nil OmniAuth.config.mock_auth[:windowslive] = nil OmniAuth.config.mock_auth[:github] = nil + OmniAuth.config.mock_auth[:wikipedia] = nil OmniAuth.config.test_mode = false end def test_create_user_form I18n.available_locales.each do |locale| - get_via_redirect "/user/new", {}, { "HTTP_ACCEPT_LANGUAGE" => locale.to_s } + reset! + 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| - dup_email = users(:public_user).email + Locale.available.each do |locale| + dup_email = create(:user).email display_name = "#{locale}_new_tester" assert_difference("User.count", 0) do assert_difference("ActionMailer::Base.deliveries.size", 0) do - post "/user/new", - { :user => { :email => dup_email, :email_confirmation => dup_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } }, - { "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" + assert_select "form > div.form-group > input.is-invalid#user_email" assert_no_missing_translations end end def test_user_create_submit_duplicate_username I18n.available_locales.each do |locale| - dup_display_name = users(:public_user).display_name + dup_display_name = create(:user).display_name email = "#{locale}_new_tester" assert_difference("User.count", 0) do assert_difference("ActionMailer::Base.deliveries.size", 0) do - post "/user/new", - { :user => { :email => email, :email_confirmation => email, :display_name => dup_display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } }, - { "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 > div.form-group > input.is-invalid#user_display_name" assert_no_missing_translations end end @@ -74,8 +88,14 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("User.count", 0) do assert_difference("ActionMailer::Base.deliveries.size", 0) do - post "/user/new", - :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 @@ -83,28 +103,62 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) do - post_via_redirect "/user/save", {}, - { "HTTP_ACCEPT_LANGUAGE" => locale.to_s } + 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 # Check the e-mail register_email = ActionMailer::Base.deliveries.first - assert_equal register_email.to[0], new_email + 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 @@ -120,37 +174,50 @@ class UserCreationTest < ActionDispatch::IntegrationTest referer = "/traces/mine" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) do - post "/user/new", - :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_via_redirect "/user/save", - :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password } + 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 # Check the e-mail register_email = ActionMailer::Base.deliveries.first - assert_equal register_email.to[0], new_email + assert_equal register_email.to.first, new_email # Check that the confirm account url is correct confirm_regex = Regexp.new("/user/redirect_tester/confirm\\?confirm_string=([a-zA-Z0-9]*)") - register_email.parts.each do |part| + email_text_parts(register_email).each do |part| assert_match confirm_regex, part.body.to_s end - confirm_string = register_email.parts[0].body.match(confirm_regex)[1] + confirm_string = email_text_parts(register_email).first.body.match(confirm_regex)[1] # 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", :confirm_string => confirm_string + 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", :confirm_string => confirm_string + post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :redirect follow_redirect! assert_response :success @@ -165,26 +232,41 @@ class UserCreationTest < ActionDispatch::IntegrationTest password = "testtest" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) do - post "/user/new", - :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", - :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 @@ -196,21 +278,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", - :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 @@ -226,44 +316,61 @@ class UserCreationTest < ActionDispatch::IntegrationTest referer = "/traces/mine" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) do - post "/user/new", - :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_via_redirect "/user/save", - :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" } + 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 # Check the e-mail register_email = ActionMailer::Base.deliveries.first - assert_equal register_email.to[0], new_email + assert_equal register_email.to.first, new_email # Check that the confirm account url is correct confirm_regex = Regexp.new("/user/redirect_tester_openid/confirm\\?confirm_string=([a-zA-Z0-9]*)") - register_email.parts.each do |part| + email_text_parts(register_email).each do |part| assert_match confirm_regex, part.body.to_s end - confirm_string = register_email.parts[0].body.match(confirm_regex)[1] + confirm_string = email_text_parts(register_email).first.body.match(confirm_regex)[1] # 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", :confirm_string => confirm_string + 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", :confirm_string => confirm_string + post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :redirect follow_redirect! assert_response :success @@ -280,26 +387,40 @@ class UserCreationTest < ActionDispatch::IntegrationTest password = "testtest" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) do - post "/user/new", - :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", - :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 @@ -311,21 +432,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", - :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 @@ -343,44 +471,60 @@ class UserCreationTest < ActionDispatch::IntegrationTest referer = "/traces/mine" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) do - post "/user/new", - :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_via_redirect "/user/save", - :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" } + 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 # Check the e-mail register_email = ActionMailer::Base.deliveries.first - assert_equal register_email.to[0], new_email + assert_equal register_email.to.first, new_email # Check that the confirm account url is correct confirm_regex = Regexp.new("/user/redirect_tester_google/confirm\\?confirm_string=([a-zA-Z0-9]*)") - register_email.parts.each do |part| + email_text_parts(register_email).each do |part| assert_match confirm_regex, part.body.to_s end - confirm_string = register_email.parts[0].body.match(confirm_regex)[1] + confirm_string = email_text_parts(register_email).first.body.match(confirm_regex)[1] # 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", :confirm_string => confirm_string + 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", :confirm_string => confirm_string + post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :redirect follow_redirect! assert_response :success @@ -395,26 +539,40 @@ class UserCreationTest < ActionDispatch::IntegrationTest password = "testtest" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) do - post "/user/new", - :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", - :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 @@ -426,21 +584,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", - :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 @@ -456,44 +621,60 @@ class UserCreationTest < ActionDispatch::IntegrationTest referer = "/traces/mine" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) do - post "/user/new", - :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_via_redirect "/user/save", - :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" } + 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 # Check the e-mail register_email = ActionMailer::Base.deliveries.first - assert_equal register_email.to[0], new_email + assert_equal register_email.to.first, new_email # Check that the confirm account url is correct confirm_regex = Regexp.new("/user/redirect_tester_facebook/confirm\\?confirm_string=([a-zA-Z0-9]*)") - register_email.parts.each do |part| + email_text_parts(register_email).each do |part| assert_match confirm_regex, part.body.to_s end - confirm_string = register_email.parts[0].body.match(confirm_regex)[1] + confirm_string = email_text_parts(register_email).first.body.match(confirm_regex)[1] # 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", :confirm_string => confirm_string + 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", :confirm_string => confirm_string + post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :redirect follow_redirect! assert_response :success @@ -508,26 +689,40 @@ class UserCreationTest < ActionDispatch::IntegrationTest password = "testtest" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) do - post "/user/new", - :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", :origin => "/user/new") - follow_redirect! - assert_response :redirect - assert_redirected_to "/user/terms" - post "/user/save", - :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 @@ -539,21 +734,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", - :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", :origin => "/user/new") - 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 @@ -569,44 +771,60 @@ class UserCreationTest < ActionDispatch::IntegrationTest referer = "/traces/mine" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) do - post "/user/new", - :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", :origin => "/user/new") - follow_redirect! - assert_response :redirect - assert_redirected_to "/user/terms" - post_via_redirect "/user/save", - :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" } + 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 # Check the e-mail register_email = ActionMailer::Base.deliveries.first - assert_equal register_email.to[0], new_email + assert_equal register_email.to.first, new_email # Check that the confirm account url is correct confirm_regex = Regexp.new("/user/redirect_tester_windowslive/confirm\\?confirm_string=([a-zA-Z0-9]*)") - register_email.parts.each do |part| + email_text_parts(register_email).each do |part| assert_match confirm_regex, part.body.to_s end - confirm_string = register_email.parts[0].body.match(confirm_regex)[1] + confirm_string = email_text_parts(register_email).first.body.match(confirm_regex)[1] # 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", :confirm_string => confirm_string + 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", :confirm_string => confirm_string + post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :redirect follow_redirect! assert_response :success @@ -621,26 +839,41 @@ class UserCreationTest < ActionDispatch::IntegrationTest password = "testtest" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) do - post "/user/new", - :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", :origin => "/user/new") - follow_redirect! - assert_response :redirect - assert_redirected_to "/user/terms" - post "/user/save", - :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 @@ -652,21 +885,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", - :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", :origin => "/user/new") - 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 @@ -682,44 +922,213 @@ class UserCreationTest < ActionDispatch::IntegrationTest referer = "/traces/mine" assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) do - post "/user/new", - :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", :origin => "/user/new") - follow_redirect! - assert_response :redirect - assert_redirected_to "/user/terms" - post_via_redirect "/user/save", - :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" } + 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 # Check the e-mail register_email = ActionMailer::Base.deliveries.first - assert_equal register_email.to[0], new_email + assert_equal register_email.to.first, new_email # Check that the confirm account url is correct confirm_regex = Regexp.new("/user/redirect_tester_github/confirm\\?confirm_string=([a-zA-Z0-9]*)") - register_email.parts.each do |part| + email_text_parts(register_email).each do |part| + assert_match confirm_regex, part.body.to_s + end + confirm_string = email_text_parts(register_email).first.body.match(confirm_regex)[1] + + # Check the page + assert_response :success + 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 "users/confirm" + + post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } + assert_response :redirect + follow_redirect! + assert_response :success + assert_template "site/welcome" + end + + def test_user_create_wikipedia_success + OmniAuth.config.add_mock(:wikipedia, :uid => "123454321") + + new_email = "newtester-wikipedia@osm.org" + display_name = "new_tester-wikipedia" + password = "testtest" + assert_difference("User.count") do + 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 => "" } } + 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 "users/confirm" + + ActionMailer::Base.deliveries.clear + end + + def test_user_create_wikipedia_failure + OmniAuth.config.mock_auth[:wikipedia] = :connection_failed + + new_email = "newtester-wikipedia2@osm.org" + display_name = "new_tester-wikipedia2" + 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, + :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 + + ActionMailer::Base.deliveries.clear + end + + def test_user_create_wikipedia_redirect + OmniAuth.config.add_mock(:wikipedia, :uid => "123454321") + + new_email = "redirect_tester_wikipedia@osm.org" + display_name = "redirect_tester_wikipedia" + # nothing special about this page, just need a protected page to redirect back to. + referer = "/traces/mine" + assert_difference("User.count") do + 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 } + 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 + + # Check the e-mail + register_email = ActionMailer::Base.deliveries.first + + assert_equal register_email.to.first, new_email + # Check that the confirm account url is correct + confirm_regex = Regexp.new("/user/redirect_tester_wikipedia/confirm\\?confirm_string=([a-zA-Z0-9]*)") + email_text_parts(register_email).each do |part| assert_match confirm_regex, part.body.to_s end - confirm_string = register_email.parts[0].body.match(confirm_regex)[1] + confirm_string = email_text_parts(register_email).first.body.match(confirm_regex)[1] # 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", :confirm_string => confirm_string + 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", :confirm_string => confirm_string + post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } assert_response :redirect follow_redirect! assert_response :success