X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/db0a80e5632df0602fbe9d3bbbf06d2cfeab3317..4a1f0da82349888796ba2c0c52868228f0fa9c70:/test/integration/user_creation_test.rb diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb index 253f298a5..4611860d0 100644 --- a/test/integration/user_creation_test.rb +++ b/test/integration/user_creation_test.rb @@ -32,10 +32,74 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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" } } + :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", + :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 end @@ -53,7 +117,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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" } } @@ -73,42 +136,52 @@ class UserCreationTest < ActionDispatch::IntegrationTest perform_enqueued_jobs do post "/user/new", :params => { :user => { :email => email, - :email_confirmation => email, :display_name => display_name, :pass_crypt => "testtest", - :pass_crypt_confirmation => "blahblah" } } + :pass_crypt_confirmation => "blahblah", + :consider_pd => "1" } } end end end assert_response :success assert_template "users/new" - assert_select "form > div > input.is-invalid#user_pass_crypt_confirmation" + assert_select "form > div > div > div > input.is-invalid#user_pass_crypt_confirmation" end - def test_user_create_success - new_email = "newtester@osm.org" - display_name = "new_tester" - + 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_difference("ActionMailer::Base.deliveries.size", 0) do + assert_no_difference("ActionMailer::Base.deliveries.size") do perform_enqueued_jobs do post "/user/new", - :params => { :user => { :email => new_email, - :email_confirmation => new_email, - :display_name => display_name, - :pass_crypt => "testtest", - :pass_crypt_confirmation => "testtest" } } + :params => { :user => { :email => 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("User.count", 1) do assert_difference("ActionMailer::Base.deliveries.size", 1) do perform_enqueued_jobs do - post "/user/save", - :params => { :read_ct => 1, :read_tou => 1 } + 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 @@ -130,7 +203,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest post confirmation_url - assert_response :redirect assert_redirected_to welcome_path user.reload @@ -139,33 +211,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest assert_equal user, User.authenticate(:username => new_email, :password => "testtest") end - def test_user_create_no_tou_failure - new_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 => 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" - assert_redirected_to "/user/terms" - end - - ActionMailer::Base.deliveries.clear - end - # Check that the user can successfully recover their password def test_lost_password_recovery_success # Open the lost password form @@ -186,19 +231,13 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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 }, + :pass_crypt_confirmation => password, + :consider_pd => "1" }, :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 } + assert_response(:redirect) + assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name follow_redirect! end end @@ -209,11 +248,11 @@ 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 @@ -222,11 +261,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest ActionMailer::Base.deliveries.clear # Go to the confirmation page - get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } + get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :success assert_template "confirmations/confirm" - post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } + post "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :redirect follow_redirect! assert_response :success @@ -234,48 +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 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, - :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 + :consider_pd => "1" } } assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") post response.location - assert_response :redirect - assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") - follow_redirect! - assert_response :redirect - assert_redirected_to "/user/terms" - post "/user/save", - :params => { :user => { :email => new_email, - :email_confirmation => new_email, - :display_name => display_name, - :auth_provider => "openid", - :auth_uid => "http://localhost:1123/new.tester", - :pass_crypt => password, - :pass_crypt_confirmation => password }, - :read_ct => 1, :read_tou => 1 } - assert_response :redirect 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 "confirmations/confirm" + assert_template "users/new" + assert_select "form > div > input.is-invalid#user_email" ActionMailer::Base.deliveries.clear end @@ -296,19 +348,13 @@ class UserCreationTest < ActionDispatch::IntegrationTest :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") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new") follow_redirect! - assert_response :redirect assert_redirected_to 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" + assert_redirected_to "/user/new" end end end @@ -317,41 +363,34 @@ 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 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, - :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 + :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_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 } + assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name follow_redirect! end end @@ -362,11 +401,11 @@ 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 @@ -375,11 +414,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest ActionMailer::Base.deliveries.clear # Go to the confirmation page - get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } + get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :success assert_template "confirmations/confirm" - post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } + post "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :redirect follow_redirect! assert_response :success @@ -388,39 +427,37 @@ class UserCreationTest < ActionDispatch::IntegrationTest def test_user_create_google_success 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 => "123454321", :info => { "email" => new_email }) + 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_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, - :email_confirmation => new_email, :display_name => display_name, :auth_provider => "google", - :pass_crypt => "", - :pass_crypt_confirmation => "" } } - assert_response :redirect + :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_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 assert_redirected_to welcome_path follow_redirect! end @@ -434,6 +471,31 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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 + def test_user_create_google_failure OmniAuth.config.mock_auth[:google] = :connection_failed @@ -447,21 +509,16 @@ class UserCreationTest < ActionDispatch::IntegrationTest :email_confirmation => new_email, :display_name => display_name, :auth_provider => "google", + :auth_uid => "123454321", :pass_crypt => "", :pass_crypt_confirmation => "" } } - assert_response :redirect assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") post response.location - 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" + assert_redirected_to "/user/new" end end end @@ -470,42 +527,39 @@ 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 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_confirmation => new_email, + :email_hmac => email_hmac, :display_name => display_name, :auth_provider => "google", - :pass_crypt => "", - :pass_crypt_confirmation => "" }, - :referer => referer } - assert_response :redirect + :auth_uid => auth_uid, + :consider_pd => "1" } } assert_redirected_to auth_path(:provider => "google", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "google") follow_redirect! - assert_response :redirect - assert_redirected_to "/user/terms" - post "/user/save", - :params => { :user => { :email => new_email, - :email_confirmation => new_email, - :display_name => display_name, - :auth_provider => "google", - :auth_uid => "http://localhost:1123/new.tester", - :pass_crypt => "testtest", - :pass_crypt_confirmation => "testtest" }, - :read_ct => 1, :read_tou => 1 } + assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name follow_redirect! end end @@ -516,11 +570,11 @@ 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 @@ -529,11 +583,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest ActionMailer::Base.deliveries.clear # Go to the confirmation page - get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } + get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :success assert_template "confirmations/confirm" - post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } + post "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :redirect follow_redirect! assert_response :success @@ -542,39 +596,36 @@ class UserCreationTest < ActionDispatch::IntegrationTest def test_user_create_facebook_success 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 => "123454321", :info => { "email" => new_email }) + OmniAuth.config.add_mock(:facebook, + :uid => auth_uid, + :info => { "email" => new_email, :name => display_name }) assert_difference("User.count") do 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, - :email_confirmation => new_email, :display_name => display_name, :auth_provider => "facebook", - :pass_crypt => "", - :pass_crypt_confirmation => "" } } - assert_response :redirect + :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_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 assert_redirected_to welcome_path follow_redirect! end @@ -588,6 +639,30 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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 + def test_user_create_facebook_failure OmniAuth.config.mock_auth[:facebook] = :connection_failed @@ -601,21 +676,16 @@ class UserCreationTest < ActionDispatch::IntegrationTest :email_confirmation => new_email, :display_name => display_name, :auth_provider => "facebook", + :auth_uid => "123454321", :pass_crypt => "", :pass_crypt_confirmation => "" } } - assert_response :redirect assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") post response.location - 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" + assert_redirected_to "/user/new" end end end @@ -624,40 +694,41 @@ 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 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_confirmation => new_email, + :email_hmac => email_hmac, :display_name => display_name, :auth_provider => "facebook", - :pass_crypt => "", - :pass_crypt_confirmation => "" }, - :referer => referer } - assert_response :redirect + :auth_uid => auth_uid, + :consider_pd => "1" } } assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "facebook") follow_redirect! + assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name 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 @@ -668,11 +739,11 @@ 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 @@ -681,11 +752,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest ActionMailer::Base.deliveries.clear # Go to the confirmation page - get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } + get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :success assert_template "confirmations/confirm" - post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } + post "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :redirect follow_redirect! assert_response :success @@ -694,39 +765,35 @@ class UserCreationTest < ActionDispatch::IntegrationTest def test_user_create_microsoft_success new_email = "newtester-microsoft@osm.org" + email_hmac = UsersController.message_hmac(new_email) display_name = "new_tester-microsoft" - password = "testtest" + auth_uid = "123454321" - OmniAuth.config.add_mock(:microsoft, :uid => "123454321", :info => { "email" => new_email }) + OmniAuth.config.add_mock(:microsoft, + :uid => auth_uid, + :info => { "email" => new_email, :name => display_name }) assert_difference("User.count") do 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, - :email_confirmation => new_email, :display_name => display_name, :auth_provider => "microsoft", - :pass_crypt => "", - :pass_crypt_confirmation => "" } } - assert_response :redirect + :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_response :redirect assert_redirected_to auth_success_path(:provider => "microsoft") 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 => "microsoft", - :auth_uid => "123454321", - :pass_crypt => password, - :pass_crypt_confirmation => password }, - :read_ct => 1, :read_tou => 1 } - assert_response :redirect assert_redirected_to welcome_path follow_redirect! end @@ -740,6 +807,30 @@ class UserCreationTest < ActionDispatch::IntegrationTest 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_microsoft_failure OmniAuth.config.mock_auth[:microsoft] = :connection_failed @@ -753,21 +844,16 @@ class UserCreationTest < ActionDispatch::IntegrationTest :email_confirmation => new_email, :display_name => display_name, :auth_provider => "microsoft", + :auth_uid => "123454321", :pass_crypt => "", :pass_crypt_confirmation => "" } } - assert_response :redirect assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "microsoft") follow_redirect! - assert_response :redirect assert_redirected_to auth_failure_path(:strategy => "microsoft", :message => "connection_failed", :origin => "/user/new") follow_redirect! - assert_response :redirect - follow_redirect! - assert_response :success - assert_template "users/new" + assert_redirected_to "/user/new" end end end @@ -776,40 +862,40 @@ class UserCreationTest < ActionDispatch::IntegrationTest end def test_user_create_microsoft_redirect - OmniAuth.config.add_mock(:microsoft, :uid => "123454321") - + 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" - # nothing special about this page, just need a protected page to redirect back to. - referer = "/traces/mine" + auth_uid = "123454321" + + OmniAuth.config.add_mock(:microsoft, + :uid => auth_uid, + :info => { :email => orig_email, :name => display_name }) + assert_difference("User.count") do assert_difference("ActionMailer::Base.deliveries.size", 1) 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 => orig_email, :email_hmac => email_hmac, + :auth_provider => "microsoft", :auth_uid => auth_uid + follow_redirect! + post "/user/new", :params => { :user => { :email => new_email, - :email_confirmation => new_email, + :email_hmac => email_hmac, :display_name => display_name, :auth_provider => "microsoft", - :pass_crypt => "", - :pass_crypt_confirmation => "" }, - :referer => referer } - assert_response :redirect + :auth_uid => auth_uid, + :consider_pd => "1" } } assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "microsoft") follow_redirect! + assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name 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 => "microsoft", - :auth_uid => "http://localhost:1123/new.tester", - :pass_crypt => "testtest", - :pass_crypt_confirmation => "testtest" }, - :read_ct => 1, :read_tou => 1 } follow_redirect! end end @@ -820,11 +906,11 @@ 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_microsoft/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 @@ -833,11 +919,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest ActionMailer::Base.deliveries.clear # Go to the confirmation page - get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } + get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :success assert_template "confirmations/confirm" - post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } + post "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :redirect follow_redirect! assert_response :success @@ -846,41 +932,41 @@ class UserCreationTest < ActionDispatch::IntegrationTest def test_user_create_github_success 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 => "123454321", :info => { "email" => new_email }) + 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 + assert_no_difference("ActionMailer::Base.deliveries.size") do perform_enqueued_jobs do - post "/user/new", - :params => { :user => { :email => new_email, - :email_confirmation => new_email, - :display_name => display_name, - :auth_provider => "github", - :pass_crypt => "", - :pass_crypt_confirmation => "" } } - assert_response :redirect - assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") - post response.location - assert_response :redirect + post auth_path(:provider => "github", :origin => "/user/new") assert_redirected_to auth_success_path(:provider => "github") follow_redirect! - assert_response :redirect - assert_redirected_to "/user/terms" - post "/user/save", + 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, - :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 - assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name + :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 @@ -888,7 +974,32 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "confirmations/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 @@ -906,21 +1017,16 @@ class UserCreationTest < ActionDispatch::IntegrationTest :email_confirmation => new_email, :display_name => display_name, :auth_provider => "github", + :auth_uid => "123454321", :pass_crypt => "", :pass_crypt_confirmation => "" } } - assert_response :redirect assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") post response.location - 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" + assert_redirected_to "/user/new" end end end @@ -929,41 +1035,39 @@ 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 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_confirmation => new_email, + :email_hmac => email_hmac, :display_name => display_name, :auth_provider => "github", - :pass_crypt => "", - :pass_crypt_confirmation => "" }, - :referer => referer } - assert_response :redirect + :auth_uid => auth_uid, + :consider_pd => "1" } } assert_redirected_to auth_path(:provider => "github", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "github") follow_redirect! + assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name 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 @@ -974,11 +1078,11 @@ 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 @@ -987,11 +1091,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest ActionMailer::Base.deliveries.clear # Go to the confirmation page - get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } + get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :success assert_template "confirmations/confirm" - post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } + post "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :redirect follow_redirect! assert_response :success @@ -1000,41 +1104,40 @@ class UserCreationTest < ActionDispatch::IntegrationTest def test_user_create_wikipedia_success 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 => "123454321", :info => { "email" => new_email }) + 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 + assert_no_difference("ActionMailer::Base.deliveries.size") 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") - post response.location - assert_response :redirect + post auth_path(:provider => "wikipedia", :origin => "/user/new") assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new") follow_redirect! - assert_response :redirect - assert_redirected_to "/user/terms" - post "/user/save", + 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, - :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 - assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name + :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 @@ -1042,7 +1145,29 @@ class UserCreationTest < ActionDispatch::IntegrationTest # Check the page assert_response :success - assert_template "confirmations/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 @@ -1060,21 +1185,16 @@ class UserCreationTest < ActionDispatch::IntegrationTest :email_confirmation => new_email, :display_name => display_name, :auth_provider => "wikipedia", + :auth_uid => "123454321", :pass_crypt => "", :pass_crypt_confirmation => "" } } - assert_response :redirect assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") post response.location - assert_response :redirect assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new") follow_redirect! - assert_response :redirect assert_redirected_to 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" + assert_redirected_to "/user/new" end end end @@ -1083,41 +1203,41 @@ 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 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_confirmation => new_email, + :email_hmac => email_hmac, :display_name => display_name, :auth_provider => "wikipedia", - :pass_crypt => "", - :pass_crypt_confirmation => "" }, - :referer => referer } - assert_response :redirect + :auth_uid => auth_uid, + :consider_pd => "1" } } assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new") post response.location - assert_response :redirect 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 - 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 @@ -1128,11 +1248,11 @@ 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 @@ -1141,11 +1261,11 @@ class UserCreationTest < ActionDispatch::IntegrationTest ActionMailer::Base.deliveries.clear # Go to the confirmation page - get "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } + get "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :success assert_template "confirmations/confirm" - post "/user/#{display_name}/confirm", :params => { :confirm_string => confirm_string } + post "/user/#{display_name}/confirm", :params => { :referer => "/welcome", :confirm_string => confirm_string } assert_response :redirect follow_redirect! assert_response :success