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)
- stub_hostip_requests
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", :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
- follow_redirect!
- assert_response :success
- assert_template "users/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
- perform_enqueued_jobs do
- post "/user/new",
- :params => { :user => { :email => dup_email,
- :email_confirmation => dup_email,
- :display_name => display_name,
- :pass_crypt => "testtest",
- :pass_crypt_confirmation => "testtest" } },
- :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
- end
+ 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,
+ :email_confirmation => dup_email,
+ :display_name => display_name,
+ :pass_crypt => "testtest",
+ :pass_crypt_confirmation => "testtest",
+ :consider_pd => "1" } }
end
end
- assert_response :success
- assert_template "users/new"
- assert_equal locale.to_s, response.headers["Content-Language"] unless locale == :root
- assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email"
- assert_no_missing_translations
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
- perform_enqueued_jobs do
- post "/user/new",
- :params => { :user => { :email => email,
- :email_confirmation => email,
- :display_name => dup_display_name,
- :pass_crypt => "testtest",
- :pass_crypt_confirmation => "testtest" } },
- :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
- end
+ 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",
+ :params => { :user => { :email => email,
+ :email_confirmation => email,
+ :display_name => dup_display_name,
+ :pass_crypt => "testtest",
+ :pass_crypt_confirmation => "testtest" } }
end
end
- assert_response :success
- assert_template "users/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"
-
- 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
+ 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,
+ :email_confirmation => email,
+ :display_name => display_name,
+ :pass_crypt => "testtest",
+ :pass_crypt_confirmation => "blahblah" } }
end
end
+ end
+ assert_response :success
+ assert_template "users/new"
+ assert_select "form > div > input.is-invalid#user_pass_crypt_confirmation"
+ 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
- perform_enqueued_jobs do
- post "/user/save",
- :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s },
- :params => { :read_ct => 1, :read_tou => 1 }
- follow_redirect!
- end
+ 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,
+ :email_confirmation => new_email,
+ :display_name => display_name,
+ :pass_crypt => "testtest",
+ :pass_crypt_confirmation => "testtest",
+ :consider_pd => "1" } }
+ assert_response :redirect
+ 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_equal register_email.to.first, new_email
- # Check that the confirm account url is correct
- assert_match(/#{@url}/, register_email.body.to_s)
+ assert_response :success
+ assert_template "confirmations/confirm"
- # Check the page
- assert_response :success
- assert_template "users/confirm"
+ user = User.find_by(:email => "newtester@osm.org")
+ assert_not_nil user
+ assert_not_predicate user, :active?
- ActionMailer::Base.deliveries.clear
- end
- end
+ 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
- def test_user_create_no_tou_failure
- I18n.available_locales.each do |locale|
- new_email = "#{locale}newtester@osm.org"
- display_name = "#{locale}_new_tester"
-
- assert_difference("User.count", 0) do
- assert_difference("ActionMailer::Base.deliveries.size", 0) do
- perform_enqueued_jobs do
- post "/user/new",
- :params => { :user => { :email => new_email,
- :email_confirmation => new_email,
- :display_name => display_name,
- :pass_crypt => "testtest",
- :pass_crypt_confirmation => "testtest" } }
- end
- end
- end
+ post confirmation_url
- assert_redirected_to "/user/terms"
+ assert_redirected_to welcome_path
- perform_enqueued_jobs do
- post "/user/save",
- :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
- assert_redirected_to "/user/terms"
- end
+ user.reload
+ assert_predicate user, :active?
- ActionMailer::Base.deliveries.clear
- end
+ 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
: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
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 "users/confirm"
+ assert_template "confirmations/confirm"
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 "users/confirm"
+ 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
:display_name => display_name,
:auth_provider => "openid",
:auth_uid => "http://localhost:1123/new.tester",
- :pass_crypt => "",
- :pass_crypt_confirmation => "" } }
- assert_response :redirect
+ :pass_crypt => password,
+ :pass_crypt_confirmation => password,
+ :consider_pd => "1" } }
assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
- follow_redirect!
- assert_response :redirect
+ post response.location
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
+ assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name
follow_redirect!
end
end
# Check the page
assert_response :success
- assert_template "users/confirm"
+ assert_template "confirmations/confirm"
ActionMailer::Base.deliveries.clear
end
:display_name => display_name,
:auth_provider => "openid",
:auth_uid => "http://localhost:1123/new.tester",
- :pass_crypt => "",
- :pass_crypt_confirmation => "" } }
- assert_response :redirect
+ :pass_crypt => "testtest",
+ :pass_crypt_confirmation => "testtest",
+ :consider_pd => "1" } }
assert_redirected_to auth_path(:provider => "openid", :openid_url => "http://localhost:1123/new.tester", :origin => "/user/new")
- follow_redirect!
- assert_response :redirect
+ post response.location
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
:display_name => display_name,
:auth_provider => "openid",
:auth_uid => "http://localhost:1123/new.tester",
- :pass_crypt => "",
- :pass_crypt_confirmation => "" },
+ :pass_crypt => "testtest",
+ :pass_crypt_confirmation => "testtest",
+ :consider_pd => "1" },
: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
+ post response.location
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
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 "users/confirm"
+ assert_template "confirmations/confirm"
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 "users/confirm"
+ 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
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"
display_name = "new_tester-google"
password = "testtest"
+
+ OmniAuth.config.add_mock(:google, :uid => "123454321", :info => { "email" => new_email })
+
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 => "google",
- :pass_crypt => "",
- :pass_crypt_confirmation => "" } }
- assert_response :redirect
+ :pass_crypt => password,
+ :pass_crypt_confirmation => password,
+ :consider_pd => "1" } }
assert_redirected_to auth_path(:provider => "google", :origin => "/user/new")
- follow_redirect!
- assert_response :redirect
+ post response.location
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
end
# Check the page
assert_response :success
- assert_template "users/confirm"
+ assert_template "site/welcome"
ActionMailer::Base.deliveries.clear
end
:display_name => display_name,
:auth_provider => "google",
:pass_crypt => "",
- :pass_crypt_confirmation => "" } }
- assert_response :redirect
+ :pass_crypt_confirmation => "",
+ :consider_pd => "1" } }
assert_redirected_to auth_path(:provider => "google", :origin => "/user/new")
- follow_redirect!
- assert_response :redirect
+ post response.location
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
:email_confirmation => new_email,
:display_name => display_name,
:auth_provider => "google",
- :pass_crypt => "",
- :pass_crypt_confirmation => "" },
+ :pass_crypt => "testtest",
+ :pass_crypt_confirmation => "testtest",
+ :consider_pd => "1" },
:referer => referer }
- assert_response :redirect
assert_redirected_to auth_path(:provider => "google", :origin => "/user/new")
- follow_redirect!
- assert_response :redirect
+ post response.location
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
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 "users/confirm"
+ assert_template "confirmations/confirm"
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 "users/confirm"
+ 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
end
def test_user_create_facebook_success
- OmniAuth.config.add_mock(:facebook, :uid => "123454321")
-
new_email = "newtester-facebook@osm.org"
display_name = "new_tester-facebook"
password = "testtest"
+
+ OmniAuth.config.add_mock(:facebook, :uid => "123454321", :info => { "email" => new_email })
+
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 => "facebook",
- :pass_crypt => "",
- :pass_crypt_confirmation => "" } }
- assert_response :redirect
+ :pass_crypt => password,
+ :pass_crypt_confirmation => password,
+ :consider_pd => "1" } }
assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new")
- follow_redirect!
- assert_response :redirect
+ post response.location
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
end
# Check the page
assert_response :success
- assert_template "users/confirm"
+ assert_template "site/welcome"
ActionMailer::Base.deliveries.clear
end
:display_name => display_name,
:auth_provider => "facebook",
:pass_crypt => "",
- :pass_crypt_confirmation => "" } }
- assert_response :redirect
+ :pass_crypt_confirmation => "",
+ :consider_pd => "1" } }
assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new")
- follow_redirect!
- assert_response :redirect
+ post response.location
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
:email_confirmation => new_email,
:display_name => display_name,
:auth_provider => "facebook",
- :pass_crypt => "",
- :pass_crypt_confirmation => "" },
+ :pass_crypt => "testtest",
+ :pass_crypt_confirmation => "testtest",
+ :consider_pd => "1" },
:referer => referer }
- assert_response :redirect
assert_redirected_to auth_path(:provider => "facebook", :origin => "/user/new")
- follow_redirect!
- assert_response :redirect
+ post response.location
assert_redirected_to auth_success_path(:provider => "facebook")
follow_redirect!
- assert_response :redirect
- assert_redirected_to "/user/terms"
- post "/user/save",
- :params => { :user => { :email => new_email,
- :email_confirmation => new_email,
- :display_name => display_name,
- :auth_provider => "facebook",
- :auth_uid => "http://localhost:1123/new.tester",
- :pass_crypt => "testtest",
- :pass_crypt_confirmation => "testtest" },
- :read_ct => 1, :read_tou => 1 }
+ assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name
follow_redirect!
end
end
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 "users/confirm"
+ assert_template "confirmations/confirm"
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 "users/confirm"
+ 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
assert_template "site/welcome"
end
- def test_user_create_windowslive_success
- OmniAuth.config.add_mock(:windowslive, :uid => "123454321")
-
- new_email = "newtester-windowslive@osm.org"
- display_name = "new_tester-windowslive"
+ def test_user_create_microsoft_success
+ new_email = "newtester-microsoft@osm.org"
+ display_name = "new_tester-microsoft"
password = "testtest"
+
+ OmniAuth.config.add_mock(:microsoft, :uid => "123454321", :info => { "email" => new_email })
+
assert_difference("User.count") do
- assert_difference("ActionMailer::Base.deliveries.size", 1) do
+ assert_difference("ActionMailer::Base.deliveries.size", 0) do
perform_enqueued_jobs do
post "/user/new",
:params => { :user => { :email => new_email,
:email_confirmation => new_email,
:display_name => display_name,
- :auth_provider => "windowslive",
- :pass_crypt => "",
- :pass_crypt_confirmation => "" } }
- assert_response :redirect
- assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")
- follow_redirect!
- assert_response :redirect
- assert_redirected_to auth_success_path(:provider => "windowslive")
- follow_redirect!
- assert_response :redirect
- assert_redirected_to "/user/terms"
- post "/user/save",
- :params => { :user => { :email => new_email,
- :email_confirmation => new_email,
- :display_name => display_name,
- :auth_provider => "windowslive",
- :auth_uid => "123454321",
+ :auth_provider => "microsoft",
:pass_crypt => password,
- :pass_crypt_confirmation => password },
- :read_ct => 1, :read_tou => 1 }
- assert_response :redirect
+ :pass_crypt_confirmation => password,
+ :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 welcome_path
follow_redirect!
end
end
# Check the page
assert_response :success
- assert_template "users/confirm"
+ assert_template "site/welcome"
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
perform_enqueued_jobs do
:params => { :user => { :email => new_email,
:email_confirmation => new_email,
:display_name => display_name,
- :auth_provider => "windowslive",
+ :auth_provider => "microsoft",
: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")
+ :pass_crypt_confirmation => "",
+ :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_response :redirect
- assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "connection_failed", :origin => "/user/new")
+ assert_redirected_to auth_failure_path(:strategy => "microsoft", :message => "connection_failed", :origin => "/user/new")
follow_redirect!
assert_response :redirect
follow_redirect!
ActionMailer::Base.deliveries.clear
end
- def test_user_create_windowslive_redirect
- OmniAuth.config.add_mock(:windowslive, :uid => "123454321")
+ def test_user_create_microsoft_redirect
+ OmniAuth.config.add_mock(:microsoft, :uid => "123454321")
- new_email = "redirect_tester_windowslive@osm.org"
- display_name = "redirect_tester_windowslive"
+ 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"
assert_difference("User.count") do
:params => { :user => { :email => new_email,
:email_confirmation => new_email,
:display_name => display_name,
- :auth_provider => "windowslive",
- :pass_crypt => "",
- :pass_crypt_confirmation => "" },
+ :auth_provider => "microsoft",
+ :pass_crypt => "testtest",
+ :pass_crypt_confirmation => "testtest",
+ :consider_pd => "1" },
: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")
+ assert_redirected_to auth_path(:provider => "microsoft", :origin => "/user/new")
+ post response.location
+ 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 => "windowslive",
- :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
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 "users/confirm"
+ assert_template "confirmations/confirm"
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 "users/confirm"
+ 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
end
def test_user_create_github_success
- OmniAuth.config.add_mock(:github, :uid => "123454321")
-
new_email = "newtester-github@osm.org"
display_name = "new_tester-github"
password = "testtest"
+
+ OmniAuth.config.add_mock(:github, :uid => "123454321", :info => { "email" => new_email })
+
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
+ :pass_crypt => password,
+ :pass_crypt_confirmation => password,
+ :consider_pd => "1" } }
assert_redirected_to auth_path(:provider => "github", :origin => "/user/new")
- follow_redirect!
- assert_response :redirect
+ post response.location
assert_redirected_to auth_success_path(:provider => "github")
follow_redirect!
- assert_response :redirect
- assert_redirected_to "/user/terms"
- post "/user/save",
- :params => { :user => { :email => new_email,
- :email_confirmation => new_email,
- :display_name => display_name,
- :auth_provider => "github",
- :auth_uid => "123454321",
- :pass_crypt => password,
- :pass_crypt_confirmation => password },
- :read_ct => 1,
- :read_tou => 1 }
- assert_response :redirect
+ assert_redirected_to welcome_path
follow_redirect!
end
end
# Check the page
assert_response :success
- assert_template "users/confirm"
+ assert_template "site/welcome"
ActionMailer::Base.deliveries.clear
end
:display_name => display_name,
:auth_provider => "github",
:pass_crypt => "",
- :pass_crypt_confirmation => "" } }
- assert_response :redirect
+ :pass_crypt_confirmation => "",
+ :consider_pd => "1" } }
assert_redirected_to auth_path(:provider => "github", :origin => "/user/new")
- follow_redirect!
- assert_response :redirect
+ post response.location
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
:email_confirmation => new_email,
:display_name => display_name,
:auth_provider => "github",
- :pass_crypt => "",
- :pass_crypt_confirmation => "" },
+ :pass_crypt => "testtest",
+ :pass_crypt_confirmation => "testtest",
+ :consider_pd => "1" },
:referer => referer }
- assert_response :redirect
assert_redirected_to auth_path(:provider => "github", :origin => "/user/new")
- follow_redirect!
- assert_response :redirect
+ post response.location
assert_redirected_to auth_success_path(:provider => "github")
follow_redirect!
- assert_response :redirect
- assert_redirected_to "/user/terms"
- post "/user/save",
- :params => { :user => { :email => new_email,
- :email_confirmation => new_email,
- :display_name => display_name,
- :auth_provider => "github",
- :auth_uid => "http://localhost:1123/new.tester",
- :pass_crypt => "testtest",
- :pass_crypt_confirmation => "testtest" },
- :read_ct => 1,
- :read_tou => 1 }
+ assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name
follow_redirect!
end
end
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 "users/confirm"
+ assert_template "confirmations/confirm"
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 "users/confirm"
+ 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
end
def test_user_create_wikipedia_success
- OmniAuth.config.add_mock(:wikipedia, :uid => "123454321")
-
new_email = "newtester-wikipedia@osm.org"
display_name = "new_tester-wikipedia"
password = "testtest"
+
+ OmniAuth.config.add_mock(:wikipedia, :uid => "123454321", :info => { "email" => new_email })
+
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
+ :pass_crypt => password,
+ :pass_crypt_confirmation => password,
+ :consider_pd => "1" } }
assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new")
- follow_redirect!
- assert_response :redirect
+ post response.location
assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new")
follow_redirect!
- assert_response :redirect
- assert_redirected_to "/user/terms"
- post "/user/save",
- :params => { :user => { :email => new_email,
- :email_confirmation => new_email,
- :display_name => display_name,
- :auth_provider => "wikipedia",
- :auth_uid => "123454321",
- :pass_crypt => password,
- :pass_crypt_confirmation => password },
- :read_ct => 1,
- :read_tou => 1 }
- assert_response :redirect
+ assert_redirected_to welcome_path
follow_redirect!
end
end
# Check the page
assert_response :success
- assert_template "users/confirm"
+ assert_template "site/welcome"
ActionMailer::Base.deliveries.clear
end
:display_name => display_name,
:auth_provider => "wikipedia",
:pass_crypt => "",
- :pass_crypt_confirmation => "" } }
- assert_response :redirect
+ :pass_crypt_confirmation => "",
+ :consider_pd => "1" } }
assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new")
- follow_redirect!
- assert_response :redirect
+ post response.location
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
:email_confirmation => new_email,
:display_name => display_name,
:auth_provider => "wikipedia",
- :pass_crypt => "",
- :pass_crypt_confirmation => "" },
+ :pass_crypt => "testtest",
+ :pass_crypt_confirmation => "testtest",
+ :consider_pd => "1" },
:referer => referer }
- assert_response :redirect
assert_redirected_to auth_path(:provider => "wikipedia", :origin => "/user/new")
- follow_redirect!
- assert_response :redirect
+ post response.location
assert_redirected_to auth_success_path(:provider => "wikipedia", :origin => "/user/new")
follow_redirect!
- assert_response :redirect
- assert_redirected_to "/user/terms"
- post "/user/save",
- :params => { :user => { :email => new_email,
- :email_confirmation => new_email,
- :display_name => display_name,
- :auth_provider => "wikipedia",
- :auth_uid => "http://localhost:1123/new.tester",
- :pass_crypt => "testtest",
- :pass_crypt_confirmation => "testtest" },
- :read_ct => 1,
- :read_tou => 1 }
+ assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name
follow_redirect!
end
end
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 "users/confirm"
+ assert_template "confirmations/confirm"
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 "users/confirm"
+ 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
projects / rails.git / blobdiff