X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/07673278f13c87fd2e073b041970bbdd45eebe86..1cf4bf5d983c65ac0bb3868f0bd962b016433265:/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 db42b22a7..4611860d0 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -2,111 +2,217 @@ require "test_helper" class UserCreationTest < ActionDispatch::IntegrationTest def setup - I18n.locale = "en" - OmniAuth.config.test_mode = true stub_request(:get, /.*gravatar.com.*d=404/).to_return(:status => 404) end def teardown - I18n.locale = "en" - OmniAuth.config.mock_auth[:openid] = nil OmniAuth.config.mock_auth[:google] = nil OmniAuth.config.mock_auth[:facebook] = nil - OmniAuth.config.mock_auth[:windowslive] = nil + OmniAuth.config.mock_auth[:microsoft] = 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| - reset! - get "/user/new", {}, { "HTTP_ACCEPT_LANGUAGE" => locale.to_s } - follow_redirect! - assert_response :success - assert_template "user/new" - end + get "/user/new" + follow_redirect! + assert_response :success + assert_template "users/new" end def test_user_create_submit_duplicate_email - I18n.available_locales.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 + dup_email = create(:user).email + display_name = "new_tester" + assert_difference("User.count", 0) do + assert_difference("ActionMailer::Base.deliveries.size", 0) do + perform_enqueued_jobs do + post "/user/new", + :params => { :user => { :email => dup_email, + :display_name => display_name, + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest", + :consider_pd => "1" } } + end + end + end + assert_response :success + assert_template "users/new" + assert_select "form" + assert_select "form > div > input.is-invalid#user_email" + end + + def test_user_create_association_bad_auth_provider + assert_difference("User.count", 0) do + assert_no_difference("ActionMailer::Base.deliveries.size") do + perform_enqueued_jobs do + post "/user/new", + :params => { :user => { :email => "test@example.com", + :display_name => "new_tester", + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest", + :auth_provider => "noprovider", + :auth_uid => "123454321", + :consider_pd => "1" } } + assert_redirected_to auth_path(:provider => "noprovider", :origin => "/user/new") + post response.location + end + end + end + assert_response :not_found + end + + def test_user_create_association_no_auth_uid + OmniAuth.config.mock_auth[:google] = :invalid_credentials + assert_difference("User.count", 0) do + assert_no_difference("ActionMailer::Base.deliveries.size") do + perform_enqueued_jobs do + post "/user/new", + :params => { :user => { :email => "test@example.com", + :display_name => "new_tester", + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest", + :auth_provider => "google", + :consider_pd => "1" } } + assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") + post response.location + end + end + end + follow_redirect! + assert_redirected_to auth_failure_path(:strategy => "google", :message => "invalid_credentials", :origin => "/user/new") + end + + def test_user_create_association_submit_duplicate_email + dup_email = create(:user).email + display_name = "new_tester" + assert_difference("User.count", 0) do + assert_no_difference("ActionMailer::Base.deliveries.size") do + perform_enqueued_jobs 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 } + :params => { :user => { :email => dup_email, + :display_name => display_name, + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest", + :auth_provider => "google", + :auth_uid => "123454321", + :consider_pd => "1" } } 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_no_missing_translations end + assert_response :success + assert_template "users/new" + assert_select "form" + assert_select "form > div > input.is-invalid#user_email" end def test_user_create_submit_duplicate_username - I18n.available_locales.each do |locale| - 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 + dup_display_name = create(:user).display_name + email = "new_tester" + assert_difference("User.count", 0) do + assert_difference("ActionMailer::Base.deliveries.size", 0) do + perform_enqueued_jobs 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 } + :params => { :user => { :email => email, + :display_name => dup_display_name, + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest" } } end end - assert_response :success - assert_template "user/new" - assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name" - assert_no_missing_translations end + assert_response :success + assert_template "users/new" + assert_select "form > div > input.is-invalid#user_display_name" end - def test_user_create_success - I18n.available_locales.each do |locale| - new_email = "#{locale}newtester@osm.org" - display_name = "#{locale}_new_tester" + def test_user_create_submit_mismatched_passwords + email = "newtester@osm.org" + display_name = "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 => email, + :display_name => display_name, + :pass_crypt => "testtest", + :pass_crypt_confirmation => "blahblah", + :consider_pd => "1" } } + end + end + end + assert_response :success + assert_template "users/new" + assert_select "form > div > div > div > input.is-invalid#user_pass_crypt_confirmation" + end - assert_difference("User.count", 0) do - assert_difference("ActionMailer::Base.deliveries.size", 0) do + def test_user_create_association_submit_duplicate_username + dup_display_name = create(:user).display_name + email = "new_tester" + assert_difference("User.count", 0) do + assert_no_difference("ActionMailer::Base.deliveries.size") do + perform_enqueued_jobs do post "/user/new", - :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } + :params => { :user => { :email => email, + :display_name => dup_display_name, + :auth_provider => "google", + :auth_uid => "123454321", + :consider_pd => "1" } } end end + end + assert_response :success + assert_template "users/new" + assert_select "form > div > input.is-invalid#user_display_name" + end - assert_redirected_to "/user/terms" + def test_user_create_success + new_email = "newtester@osm.org" + display_name = "new_tester" - assert_difference("User.count") do - assert_difference("ActionMailer::Base.deliveries.size", 1) do - post "/user/save", {}, - { "HTTP_ACCEPT_LANGUAGE" => locale.to_s } + assert_difference("User.count", 1) do + assert_difference("ActionMailer::Base.deliveries.size", 1) do + perform_enqueued_jobs do + post "/user/new", + :params => { :user => { :email => new_email, + :display_name => display_name, + :pass_crypt => "testtest", + :pass_crypt_confirmation => "testtest", + :consider_pd => "1" } } + assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name follow_redirect! end end + end - # Check the e-mail - register_email = ActionMailer::Base.deliveries.first + assert_response :success + assert_template "confirmations/confirm" - assert_equal register_email.to.first, new_email - # Check that the confirm account url is correct - assert_match /#{@url}/, register_email.body.to_s + user = User.find_by(:email => "newtester@osm.org") + assert_not_nil user + assert_not_predicate user, :active? - # Check the page - assert_response :success - assert_template "user/confirm" + register_email = ActionMailer::Base.deliveries.first + assert_equal register_email.to.first, new_email + found_confirmation_url = register_email.parts.first.parts.first.to_s =~ %r{\shttp://test.host(/\S+)\s} + assert found_confirmation_url + confirmation_url = Regexp.last_match(1) + ActionMailer::Base.deliveries.clear - ActionMailer::Base.deliveries.clear - end + post confirmation_url + + assert_redirected_to welcome_path + + user.reload + assert_predicate user, :active? + + assert_equal user, User.authenticate(:username => new_email, :password => "testtest") end # Check that the user can successfully recover their password - def lost_password_recovery_success + def test_lost_password_recovery_success # Open the lost password form # Submit the lost password form # Check the e-mail @@ -122,12 +228,18 @@ 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 "/user/save", - :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password } - follow_redirect! + perform_enqueued_jobs do + post "/user/new", + :params => { :user => { :email => new_email, + :display_name => display_name, + :pass_crypt => password, + :pass_crypt_confirmation => password, + :consider_pd => "1" }, + :referer => referer } + assert_response(:redirect) + assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name + follow_redirect! + end end end @@ -136,24 +248,24 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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]*)") + confirm_regex = Regexp.new("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 = email_text_parts(register_email).first.body.match(confirm_regex)[1] + confirm_string = CGI.unescape(email_text_parts(register_email).first.body.match(confirm_regex)[1]) # Check the page assert_response :success - assert_template "user/confirm" + assert_template "confirmations/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 => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :success - assert_template "user/confirm" + assert_template "confirmations/confirm" - post "/user/#{display_name}/confirm", :confirm_string => confirm_string + post "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :redirect follow_redirect! assert_response :success @@ -161,33 +273,61 @@ class UserCreationTest < ActionDispatch::IntegrationTest end def test_user_create_openid_success - OmniAuth.config.add_mock(:openid, :uid => "http://localhost:1123/new.tester") - new_email = "newtester-openid@osm.org" display_name = "new_tester-openid" - password = "testtest" + auth_uid = "http://localhost:1123/new.tester" + + OmniAuth.config.add_mock(:openid, + :uid => auth_uid, + :info => { :email => new_email, :name => display_name }) + 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 auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") + assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") + follow_redirect! + assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, :email => new_email, + :auth_provider => "openid", :auth_uid => auth_uid + follow_redirect! + post "/user/new", + :params => { :user => { :email => new_email, + :display_name => display_name, + :auth_provider => "openid", + :auth_uid => "http://localhost:1123/new.tester", + :consider_pd => "1" } } + assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") + post response.location + follow_redirect! + end end end # Check the page + assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name + + ActionMailer::Base.deliveries.clear + end + + def test_user_create_openid_duplicate_email + dup_user = create(:user) + display_name = "new_tester-openid" + auth_uid = "123454321" + + OmniAuth.config.add_mock(:openid, + :uid => auth_uid, + :info => { :email => dup_user.email, :name => display_name }) + + post auth_path(:provider => "openid", :origin => "/user/new") + assert_redirected_to auth_success_path(:provider => "openid", :origin => "/user/new") + follow_redirect! + assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, :email => dup_user.email, + :auth_provider => "openid", :auth_uid => auth_uid + follow_redirect! + assert_response :success - assert_template "user/confirm" + assert_template "users/new" + assert_select "form > div > input.is-invalid#user_email" ActionMailer::Base.deliveries.clear end @@ -199,21 +339,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_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") + post response.location + assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") + follow_redirect! + assert_redirected_to auth_failure_path(:strategy => "openid", :message => "connection_failed", :origin => "/user/new") + follow_redirect! + assert_redirected_to "/user/new" + end end end @@ -221,27 +363,36 @@ class UserCreationTest < ActionDispatch::IntegrationTest end def test_user_create_openid_redirect - OmniAuth.config.add_mock(:openid, :uid => "http://localhost:1123/new.tester") - + auth_uid = "http://localhost:1123/new.tester" new_email = "redirect_tester_openid@osm.org" display_name = "redirect_tester_openid" - # nothing special about this page, just need a protected page to redirect back to. - referer = "/traces/mine" + + OmniAuth.config.add_mock(:openid, + :uid => auth_uid, + :info => { :email => new_email, :name => display_name }) + 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 "/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" } - follow_redirect! + perform_enqueued_jobs do + post auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") + assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") + follow_redirect! + assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, :email => new_email, + :auth_provider => "openid", :auth_uid => auth_uid + follow_redirect! + post "/user/new", + :params => { :user => { :email => new_email, + :display_name => display_name, + :auth_provider => "openid", + :auth_uid => auth_uid, + :consider_pd => "1" } } + assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") + post response.location + assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") + follow_redirect! + assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name + follow_redirect! + end end end @@ -250,24 +401,24 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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]*)") + confirm_regex = Regexp.new("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 = email_text_parts(register_email).first.body.match(confirm_regex)[1] + confirm_string = CGI.unescape(email_text_parts(register_email).first.body.match(confirm_regex)[1]) # Check the page assert_response :success - assert_template "user/confirm" + assert_template "confirmations/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 => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :success - assert_template "user/confirm" + assert_template "confirmations/confirm" - post "/user/#{display_name}/confirm", :confirm_string => confirm_string + post "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :redirect follow_redirect! assert_response :success @@ -275,35 +426,72 @@ class UserCreationTest < ActionDispatch::IntegrationTest end def test_user_create_google_success - OmniAuth.config.add_mock(:google, :uid => "123454321", :extra => { - :id_info => { "openid_id" => "http://localhost:1123/new.tester" } - }) - new_email = "newtester-google@osm.org" + email_hmac = UsersController.message_hmac(new_email) display_name = "new_tester-google" - password = "testtest" + auth_uid = "123454321" + + OmniAuth.config.add_mock(:google, + :uid => auth_uid, + :extra => { :id_info => { :openid_id => "http://localhost:1123/new.tester" } }, + :info => { :email => new_email, :name => display_name }) + 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! + assert_no_difference("ActionMailer::Base.deliveries.size") do + perform_enqueued_jobs do + post auth_path(:provider => "google", :origin => "/user/new") + assert_redirected_to auth_success_path(:provider => "google") + follow_redirect! + assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, + :email => new_email, :email_hmac => email_hmac, + :auth_provider => "google", :auth_uid => auth_uid + follow_redirect! + + post "/user/new", + :params => { :user => { :email => new_email, + :display_name => display_name, + :auth_provider => "google", + :auth_uid => auth_uid, + :consider_pd => "1" }, + :email_hmac => email_hmac } + assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") + post response.location + assert_redirected_to auth_success_path(:provider => "google") + follow_redirect! + assert_redirected_to welcome_path + follow_redirect! + end end end # Check the page assert_response :success - assert_template "user/confirm" + assert_template "site/welcome" + + ActionMailer::Base.deliveries.clear + end + + def test_user_create_google_duplicate_email + dup_user = create(:user) + display_name = "new_tester-google" + auth_uid = "123454321" + + OmniAuth.config.add_mock(:google, + :uid => auth_uid, + :extra => { :id_info => { :openid_id => "http://localhost:1123/new.tester" } }, + :info => { :email => dup_user.email, :name => display_name }) + + post auth_path(:provider => "google", :origin => "/user/new") + assert_redirected_to auth_success_path(:provider => "google") + follow_redirect! + assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, :email => dup_user.email, + :email_hmac => UsersController.message_hmac(dup_user.email), + :auth_provider => "google", :auth_uid => auth_uid + follow_redirect! + + assert_response :success + assert_template "users/new" + assert_select "form > div > input.is-invalid#user_email" ActionMailer::Base.deliveries.clear end @@ -315,21 +503,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", + :auth_uid => "123454321", + :pass_crypt => "", + :pass_crypt_confirmation => "" } } + assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") + post response.location + assert_redirected_to auth_success_path(:provider => "google") + follow_redirect! + assert_redirected_to auth_failure_path(:strategy => "google", :message => "connection_failed", :origin => "/user/new") + follow_redirect! + assert_redirected_to "/user/new" + end end end @@ -337,29 +527,41 @@ class UserCreationTest < ActionDispatch::IntegrationTest end def test_user_create_google_redirect - OmniAuth.config.add_mock(:google, :uid => "123454321", :extra => { - :id_info => { "openid_id" => "http://localhost:1123/new.tester" } - }) - - new_email = "redirect_tester_google@osm.org" + orig_email = "redirect_tester_google_orig@google.com" + email_hmac = UsersController.message_hmac(orig_email) + new_email = "redirect_tester_google@osm.org" display_name = "redirect_tester_google" - # nothing special about this page, just need a protected page to redirect back to. - referer = "/traces/mine" + auth_uid = "123454321" + + OmniAuth.config.add_mock(:google, + :uid => auth_uid, + :extra => { :id_info => { :openid_id => "http://localhost:1123/new.tester" } }, + :info => { :email => orig_email, :name => display_name }) + 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 "/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" } - follow_redirect! + perform_enqueued_jobs do + post auth_path(:provider => "google", :origin => "/user/new") + assert_redirected_to auth_success_path(:provider => "google") + follow_redirect! + assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, + :email => orig_email, :email_hmac => email_hmac, + :auth_provider => "google", :auth_uid => auth_uid + follow_redirect! + post "/user/new", + :params => { :user => { :email => new_email, + :email_hmac => email_hmac, + :display_name => display_name, + :auth_provider => "google", + :auth_uid => auth_uid, + :consider_pd => "1" } } + assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") + post response.location + assert_redirected_to auth_success_path(:provider => "google") + follow_redirect! + assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name + follow_redirect! + end end end @@ -368,24 +570,24 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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]*)") + confirm_regex = Regexp.new("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 = email_text_parts(register_email).first.body.match(confirm_regex)[1] + confirm_string = CGI.unescape(email_text_parts(register_email).first.body.match(confirm_regex)[1]) # Check the page assert_response :success - assert_template "user/confirm" + assert_template "confirmations/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 => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :success - assert_template "user/confirm" + assert_template "confirmations/confirm" - post "/user/#{display_name}/confirm", :confirm_string => confirm_string + post "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :redirect follow_redirect! assert_response :success @@ -393,33 +595,70 @@ class UserCreationTest < ActionDispatch::IntegrationTest end def test_user_create_facebook_success - OmniAuth.config.add_mock(:facebook, :uid => "123454321") - new_email = "newtester-facebook@osm.org" + email_hmac = UsersController.message_hmac(new_email) display_name = "new_tester-facebook" - password = "testtest" + auth_uid = "123454321" + + OmniAuth.config.add_mock(:facebook, + :uid => auth_uid, + :info => { "email" => new_email, :name => display_name }) + 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! + assert_no_difference("ActionMailer::Base.deliveries.size") do + perform_enqueued_jobs do + post auth_path(:provider => "facebook", :origin => "/user/new") + assert_redirected_to auth_success_path(:provider => "facebook") + follow_redirect! + assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, + :email => new_email, :email_hmac => email_hmac, + :auth_provider => "facebook", :auth_uid => auth_uid + follow_redirect! + + post "/user/new", + :params => { :user => { :email => new_email, + :display_name => display_name, + :auth_provider => "facebook", + :auth_uid => auth_uid, + :consider_pd => "1" }, + :email_hmac => email_hmac } + assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") + post response.location + assert_redirected_to auth_success_path(:provider => "facebook") + follow_redirect! + assert_redirected_to welcome_path + follow_redirect! + end end end # Check the page assert_response :success - assert_template "user/confirm" + assert_template "site/welcome" + + ActionMailer::Base.deliveries.clear + end + + def test_user_create_facebook_duplicate_email + dup_user = create(:user) + display_name = "new_tester-facebook" + auth_uid = "123454321" + + OmniAuth.config.add_mock(:facebook, + :uid => auth_uid, + :info => { :email => dup_user.email, :name => display_name }) + + post auth_path(:provider => "facebook", :origin => "/user/new") + assert_redirected_to auth_success_path(:provider => "facebook") + follow_redirect! + assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, :email => dup_user.email, + :email_hmac => UsersController.message_hmac(dup_user.email), + :auth_provider => "facebook", :auth_uid => auth_uid + follow_redirect! + + assert_response :success + assert_template "users/new" + assert_select "form > div > input.is-invalid#user_email" ActionMailer::Base.deliveries.clear end @@ -431,21 +670,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", + :auth_uid => "123454321", + :pass_crypt => "", + :pass_crypt_confirmation => "" } } + assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") + post response.location + assert_redirected_to auth_success_path(:provider => "facebook") + follow_redirect! + assert_redirected_to auth_failure_path(:strategy => "facebook", :message => "connection_failed", :origin => "/user/new") + follow_redirect! + assert_redirected_to "/user/new" + end end end @@ -453,27 +694,43 @@ class UserCreationTest < ActionDispatch::IntegrationTest end def test_user_create_facebook_redirect - OmniAuth.config.add_mock(:facebook, :uid => "123454321") - + orig_email = "redirect_tester_facebook_orig@osm.org" + email_hmac = UsersController.message_hmac(orig_email) new_email = "redirect_tester_facebook@osm.org" display_name = "redirect_tester_facebook" + auth_uid = "123454321" + + OmniAuth.config.add_mock(:facebook, + :uid => auth_uid, + :info => { :email => orig_email, :name => display_name }) + # 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 - 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 "/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" } - follow_redirect! + perform_enqueued_jobs do + post auth_path(:provider => "facebook", :origin => "/user/new") + assert_redirected_to auth_success_path(:provider => "facebook") + follow_redirect! + assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, + :email => orig_email, :email_hmac => email_hmac, + :auth_provider => "facebook", :auth_uid => auth_uid + follow_redirect! + + post "/user/new", + :params => { :user => { :email => new_email, + :email_hmac => email_hmac, + :display_name => display_name, + :auth_provider => "facebook", + :auth_uid => auth_uid, + :consider_pd => "1" } } + assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") + post response.location + assert_redirected_to auth_success_path(:provider => "facebook") + follow_redirect! + assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name + assert_response :redirect + follow_redirect! + end end end @@ -482,112 +739,165 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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]*)") + confirm_regex = Regexp.new("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 = email_text_parts(register_email).first.body.match(confirm_regex)[1] + confirm_string = CGI.unescape(email_text_parts(register_email).first.body.match(confirm_regex)[1]) # Check the page assert_response :success - assert_template "user/confirm" + assert_template "confirmations/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 => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :success - assert_template "user/confirm" + assert_template "confirmations/confirm" - post "/user/#{display_name}/confirm", :confirm_string => confirm_string + post "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :redirect follow_redirect! assert_response :success assert_template "site/welcome" end - def test_user_create_windowslive_success - OmniAuth.config.add_mock(:windowslive, :uid => "123454321") + def test_user_create_microsoft_success + new_email = "newtester-microsoft@osm.org" + email_hmac = UsersController.message_hmac(new_email) + display_name = "new_tester-microsoft" + auth_uid = "123454321" + + OmniAuth.config.add_mock(:microsoft, + :uid => auth_uid, + :info => { "email" => new_email, :name => display_name }) - new_email = "newtester-windowslive@osm.org" - display_name = "new_tester-windowslive" - 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") - 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! + assert_difference("ActionMailer::Base.deliveries.size", 0) do + perform_enqueued_jobs do + post auth_path(:provider => "microsoft", :origin => "/user/new") + assert_redirected_to auth_success_path(:provider => "microsoft") + follow_redirect! + assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, + :email => new_email, :email_hmac => email_hmac, + :auth_provider => "microsoft", :auth_uid => auth_uid + follow_redirect! + post "/user/new", + :params => { :user => { :email => new_email, + :display_name => display_name, + :auth_provider => "microsoft", + :auth_uid => auth_uid, + :consider_pd => "1" }, + :email_hmac => email_hmac } + assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new") + post response.location + assert_redirected_to auth_success_path(:provider => "microsoft") + follow_redirect! + assert_redirected_to welcome_path + follow_redirect! + end end end # Check the page assert_response :success - assert_template "user/confirm" + assert_template "site/welcome" + + ActionMailer::Base.deliveries.clear + end + + def test_user_create_microsoft_duplicate_email + dup_user = create(:user) + display_name = "new_tester-microsoft" + auth_uid = "123454321" + + OmniAuth.config.add_mock(:microsoft, + :uid => auth_uid, + :info => { :email => dup_user.email, :name => display_name }) + + post auth_path(:provider => "microsoft", :origin => "/user/new") + assert_redirected_to auth_success_path(:provider => "microsoft") + follow_redirect! + assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, :email => dup_user.email, + :email_hmac => UsersController.message_hmac(dup_user.email), + :auth_provider => "microsoft", :auth_uid => auth_uid + follow_redirect! + + assert_response :success + assert_template "users/new" + assert_select "form > div > input.is-invalid#user_email" ActionMailer::Base.deliveries.clear end - def test_user_create_windowslive_failure - OmniAuth.config.mock_auth[:windowslive] = :connection_failed + def test_user_create_microsoft_failure + OmniAuth.config.mock_auth[:microsoft] = :connection_failed - new_email = "newtester-windowslive2@osm.org" - display_name = "new_tester-windowslive2" + new_email = "newtester-microsoft2@osm.org" + display_name = "new_tester-microsoft2" 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") - 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 => "microsoft", + :auth_uid => "123454321", + :pass_crypt => "", + :pass_crypt_confirmation => "" } } + assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new") + post response.location + assert_redirected_to auth_success_path(:provider => "microsoft") + follow_redirect! + assert_redirected_to auth_failure_path(:strategy => "microsoft", :message => "connection_failed", :origin => "/user/new") + follow_redirect! + assert_redirected_to "/user/new" + end end end ActionMailer::Base.deliveries.clear end - def test_user_create_windowslive_redirect - OmniAuth.config.add_mock(:windowslive, :uid => "123454321") + def test_user_create_microsoft_redirect + orig_email = "redirect_tester_microsoft_orig@osm.org" + email_hmac = UsersController.message_hmac(orig_email) + new_email = "redirect_tester_microsoft@osm.org" + display_name = "redirect_tester_microsoft" + auth_uid = "123454321" + + OmniAuth.config.add_mock(:microsoft, + :uid => auth_uid, + :info => { :email => orig_email, :name => display_name }) - new_email = "redirect_tester_windowslive@osm.org" - display_name = "redirect_tester_windowslive" - # 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 - 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") - 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 => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } - follow_redirect! + perform_enqueued_jobs do + post auth_path(:provider => "microsoft", :origin => "/user/new") + assert_redirected_to auth_success_path(:provider => "microsoft") + follow_redirect! + assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, + :email => orig_email, :email_hmac => email_hmac, + :auth_provider => "microsoft", :auth_uid => auth_uid + follow_redirect! + + post "/user/new", + :params => { :user => { :email => new_email, + :email_hmac => email_hmac, + :display_name => display_name, + :auth_provider => "microsoft", + :auth_uid => auth_uid, + :consider_pd => "1" } } + assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new") + post response.location + assert_redirected_to auth_success_path(:provider => "microsoft") + follow_redirect! + assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name + assert_response :redirect + follow_redirect! + end end end @@ -596,24 +906,24 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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]*)") + confirm_regex = Regexp.new("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 = email_text_parts(register_email).first.body.match(confirm_regex)[1] + confirm_string = CGI.unescape(email_text_parts(register_email).first.body.match(confirm_regex)[1]) # Check the page assert_response :success - assert_template "user/confirm" + assert_template "confirmations/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 => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :success - assert_template "user/confirm" + assert_template "confirmations/confirm" - post "/user/#{display_name}/confirm", :confirm_string => confirm_string + post "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :redirect follow_redirect! assert_response :success @@ -621,33 +931,75 @@ class UserCreationTest < ActionDispatch::IntegrationTest end def test_user_create_github_success - OmniAuth.config.add_mock(:github, :uid => "123454321") - new_email = "newtester-github@osm.org" + email_hmac = UsersController.message_hmac(new_email) display_name = "new_tester-github" password = "testtest" + auth_uid = "123454321" + + OmniAuth.config.add_mock(:github, + :uid => auth_uid, + :info => { "email" => new_email, :name => display_name }) + 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") - 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! + assert_no_difference("ActionMailer::Base.deliveries.size") do + perform_enqueued_jobs do + post auth_path(:provider => "github", :origin => "/user/new") + assert_redirected_to auth_success_path(:provider => "github") + follow_redirect! + assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, + :email => new_email, :email_hmac => email_hmac, + :auth_provider => "github", :auth_uid => auth_uid + follow_redirect! + + post "/user/new", + :params => { :user => { :email => 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, + :email_hmac => email_hmac } + assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") + post response.location + assert_redirected_to auth_success_path(:provider => "github") + follow_redirect! + assert_redirected_to welcome_path + follow_redirect! + end end end # Check the page assert_response :success - assert_template "user/confirm" + assert_template "site/welcome" + + ActionMailer::Base.deliveries.clear + end + + def test_user_create_github_duplicate_email + dup_user = create(:user) + display_name = "new_tester-github" + auth_uid = "123454321" + + OmniAuth.config.add_mock(:github, + :uid => auth_uid, + :extra => { :id_info => { :openid_id => "http://localhost:1123/new.tester" } }, + :info => { :email => dup_user.email, :name => display_name }) + + post auth_path(:provider => "github", :origin => "/user/new") + assert_redirected_to auth_success_path(:provider => "github") + follow_redirect! + assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, + :email => dup_user.email, :email_hmac => UsersController.message_hmac(dup_user.email), + :auth_provider => "github", :auth_uid => auth_uid + follow_redirect! + + assert_response :success + assert_template "users/new" + assert_select "form > div > input.is-invalid#user_email" ActionMailer::Base.deliveries.clear end @@ -659,21 +1011,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") - 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", + :auth_uid => "123454321", + :pass_crypt => "", + :pass_crypt_confirmation => "" } } + assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") + post response.location + assert_redirected_to auth_success_path(:provider => "github") + follow_redirect! + assert_redirected_to auth_failure_path(:strategy => "github", :message => "connection_failed", :origin => "/user/new") + follow_redirect! + assert_redirected_to "/user/new" + end end end @@ -681,27 +1035,41 @@ class UserCreationTest < ActionDispatch::IntegrationTest end def test_user_create_github_redirect - OmniAuth.config.add_mock(:github, :uid => "123454321") - + orig_email = "redirect_tester_github_orig@osm.org" + email_hmac = UsersController.message_hmac(orig_email) new_email = "redirect_tester_github@osm.org" display_name = "redirect_tester_github" - # nothing special about this page, just need a protected page to redirect back to. - referer = "/traces/mine" + auth_uid = "123454321" + + OmniAuth.config.add_mock(:github, + :uid => auth_uid, + :info => { :email => orig_email, :name => display_name }) + 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") - 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 => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } - follow_redirect! + perform_enqueued_jobs do + post auth_path(:provider => "github", :origin => "/user/new") + assert_redirected_to auth_success_path(:provider => "github") + follow_redirect! + assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, + :email => orig_email, :email_hmac => email_hmac, + :auth_provider => "github", :auth_uid => auth_uid + follow_redirect! + post "/user/new", + :params => { :user => { :email => new_email, + :email_hmac => email_hmac, + :display_name => display_name, + :auth_provider => "github", + :auth_uid => auth_uid, + :consider_pd => "1" } } + assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") + post response.location + assert_redirected_to auth_success_path(:provider => "github") + follow_redirect! + assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name + assert_response :redirect + follow_redirect! + end end end @@ -710,24 +1078,24 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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]*)") + confirm_regex = Regexp.new("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 = email_text_parts(register_email).first.body.match(confirm_regex)[1] + confirm_string = CGI.unescape(email_text_parts(register_email).first.body.match(confirm_regex)[1]) # Check the page assert_response :success - assert_template "user/confirm" + assert_template "confirmations/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 => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :success - assert_template "user/confirm" + assert_template "confirmations/confirm" - post "/user/#{display_name}/confirm", :confirm_string => confirm_string + post "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :redirect follow_redirect! assert_response :success @@ -735,33 +1103,71 @@ class UserCreationTest < ActionDispatch::IntegrationTest end def test_user_create_wikipedia_success - OmniAuth.config.add_mock(:wikipedia, :uid => "123454321") - new_email = "newtester-wikipedia@osm.org" + email_hmac = UsersController.message_hmac(new_email) display_name = "new_tester-wikipedia" password = "testtest" + auth_uid = "123454321" + + OmniAuth.config.add_mock(:wikipedia, + :uid => auth_uid, + :info => { :email => new_email, :name => display_name }) + 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 => "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", - :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :auth_uid => "123454321", :pass_crypt => password, :pass_crypt_confirmation => password } - assert_response :redirect - follow_redirect! + assert_no_difference("ActionMailer::Base.deliveries.size") do + perform_enqueued_jobs do + post auth_path(:provider => "wikipedia", :origin => "/user/new") + assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new") + follow_redirect! + assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, + :email => new_email, :email_hmac => email_hmac, + :auth_provider => "wikipedia", :auth_uid => auth_uid + follow_redirect! + post "/user/new", + :params => { :user => { :email => 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, + :email_hmac => email_hmac } + assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") + post response.location + assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new") + follow_redirect! + assert_redirected_to welcome_path + follow_redirect! + end end end # Check the page assert_response :success - assert_template "user/confirm" + assert_template "site/welcome" + end + + def test_user_create_wikipedia_duplicate_email + dup_user = create(:user) + display_name = "new_tester-wikipedia" + auth_uid = "123454321" + + OmniAuth.config.add_mock(:wikipedia, + :uid => auth_uid, + :info => { "email" => dup_user.email, :name => display_name }) + + post auth_path(:provider => "wikipedia", :origin => "/user/new") + assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new") + follow_redirect! + assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, + :email => dup_user.email, :email_hmac => UsersController.message_hmac(dup_user.email), + :auth_provider => "wikipedia", :auth_uid => auth_uid + follow_redirect! + + assert_response :success + assert_template "users/new" + assert_select "form > div > input.is-invalid#user_email" ActionMailer::Base.deliveries.clear end @@ -773,21 +1179,23 @@ class UserCreationTest < ActionDispatch::IntegrationTest display_name = "new_tester-wikipedia2" assert_difference("User.count", 0) do assert_difference("ActionMailer::Base.deliveries.size", 0) do - post "/user/new", - :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :pass_crypt => "", :pass_crypt_confirmation => "" } - assert_response :redirect - assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") - follow_redirect! - assert_response :redirect - assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new") - follow_redirect! - assert_response :redirect - assert_redirected_to auth_failure_path(:strategy => "wikipedia", :message => "connection_failed", :origin => "/user/new") - follow_redirect! - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "user/new" + perform_enqueued_jobs do + post "/user/new", + :params => { :user => { :email => new_email, + :email_confirmation => new_email, + :display_name => display_name, + :auth_provider => "wikipedia", + :auth_uid => "123454321", + :pass_crypt => "", + :pass_crypt_confirmation => "" } } + assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") + post response.location + assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new") + follow_redirect! + assert_redirected_to auth_failure_path(:strategy => "wikipedia", :message => "connection_failed", :origin => "/user/new") + follow_redirect! + assert_redirected_to "/user/new" + end end end @@ -795,27 +1203,43 @@ class UserCreationTest < ActionDispatch::IntegrationTest end def test_user_create_wikipedia_redirect - OmniAuth.config.add_mock(:wikipedia, :uid => "123454321") - + orig_email = "redirect_tester_wikipedia_orig@osm.org" + email_hmac = UsersController.message_hmac(orig_email) new_email = "redirect_tester_wikipedia@osm.org" display_name = "redirect_tester_wikipedia" + auth_uid = "123454321" + + OmniAuth.config.add_mock(:wikipedia, + :uid => auth_uid, + :info => { :email => orig_email, :name => display_name }) + # 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 - post "/user/new", - :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", - :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", :auth_uid => "http://localhost:1123/new.tester", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } - follow_redirect! + perform_enqueued_jobs do + post auth_path(:provider => "wikipedia", :origin => "/user/new") + assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new") + follow_redirect! + assert_redirected_to :controller => :users, :action => "new", :nickname => display_name, + :email => orig_email, :email_hmac => email_hmac, + :auth_provider => "wikipedia", :auth_uid => auth_uid + follow_redirect! + + post "/user/new", + :params => { :user => { :email => new_email, + :email_hmac => email_hmac, + :display_name => display_name, + :auth_provider => "wikipedia", + :auth_uid => auth_uid, + :consider_pd => "1" } } + assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") + post response.location + assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new") + follow_redirect! + assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name + assert_response :redirect + follow_redirect! + end end end @@ -824,24 +1248,24 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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]*)") + confirm_regex = Regexp.new("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 = email_text_parts(register_email).first.body.match(confirm_regex)[1] + confirm_string = CGI.unescape(email_text_parts(register_email).first.body.match(confirm_regex)[1]) # Check the page assert_response :success - assert_template "user/confirm" + assert_template "confirmations/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 => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :success - assert_template "user/confirm" + assert_template "confirmations/confirm" - post "/user/#{display_name}/confirm", :confirm_string => confirm_string + post "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :redirect follow_redirect! assert_response :success