X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f6695c9079f4eeeecaa796c879868f797f97cd55..a254efb5ec6b30601aeb82cf6380ace02d71c4e8:/test/integration/user_creation_test.rb?ds=sidebyside diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb index d999b5fb5..ba4c12b8c 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -1,12 +1,13 @@ require "test_helper" class UserCreationTest < ActionDispatch::IntegrationTest - fixtures :users - def setup I18n.locale = "en" OmniAuth.config.test_mode = true + + stub_request(:get, /.*gravatar.com.*d=404/).to_return(:status => 404) + stub_hostip_requests end def teardown @@ -17,30 +18,35 @@ 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 + 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_template "users/new" assert_equal locale.to_s, response.headers["Content-Language"] unless locale == :root assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email" assert_no_missing_translations @@ -49,17 +55,19 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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_template "users/new" assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name" assert_no_missing_translations end @@ -72,8 +80,10 @@ 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 @@ -81,21 +91,51 @@ 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 @@ -118,37 +158,40 @@ 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 @@ -163,26 +206,28 @@ 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 @@ -194,21 +239,23 @@ 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 @@ -224,44 +271,47 @@ 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 @@ -278,26 +328,28 @@ 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 @@ -309,21 +361,23 @@ 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 @@ -341,44 +395,47 @@ 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 @@ -393,26 +450,28 @@ 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 @@ -424,21 +483,23 @@ 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 @@ -454,44 +515,47 @@ 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 @@ -506,26 +570,28 @@ 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 @@ -537,21 +603,23 @@ 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 @@ -567,44 +635,47 @@ 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 @@ -619,26 +690,28 @@ 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 @@ -650,21 +723,23 @@ 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 @@ -680,44 +755,167 @@ 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