: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_select "form > div > input.is-invalid#user_display_name"
end
- def test_user_create_success
- new_email = "newtester@osm.org"
+ 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 => new_email,
- :email_confirmation => new_email,
+ :params => { :user => { :email => email,
+ :email_confirmation => email,
:display_name => display_name,
:pass_crypt => "testtest",
- :pass_crypt_confirmation => "testtest" } }
+ :pass_crypt_confirmation => "blahblah" } }
end
end
end
-
- assert_redirected_to "/user/terms"
-
- assert_difference("User.count") do
- assert_difference("ActionMailer::Base.deliveries.size", 1) do
- perform_enqueued_jobs do
- post "/user/save",
- :params => { :read_ct => 1, :read_tou => 1 }
- follow_redirect!
- end
- end
- end
-
- # Check the e-mail
- register_email = ActionMailer::Base.deliveries.first
-
- assert_equal register_email.to.first, new_email
- # Check that the confirm account url is correct
- assert_match(/#{@url}/, register_email.body.to_s)
-
- # Check the page
assert_response :success
- assert_template "confirmations/confirm"
-
- ActionMailer::Base.deliveries.clear
+ assert_template "users/new"
+ assert_select "form > div > input.is-invalid#user_pass_crypt_confirmation"
end
- def test_user_create_no_tou_failure
- new_email = "#newtester@osm.org"
+ def test_user_create_success
+ new_email = "newtester@osm.org"
display_name = "new_tester"
- assert_difference("User.count", 0) do
- assert_difference("ActionMailer::Base.deliveries.size", 0) do
+ 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" } }
+ :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
- assert_redirected_to "/user/terms"
+ assert_response :success
+ assert_template "confirmations/confirm"
- perform_enqueued_jobs do
- post "/user/save"
- assert_redirected_to "/user/terms"
- end
+ user = User.find_by(:email => "newtester@osm.org")
+ assert_not_nil user
+ assert_not_predicate user, :active?
+ 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
+
+ post confirmation_url
+
+ assert_redirected_to welcome_path
+
+ user.reload
+ assert_predicate user, :active?
+
+ assert_equal user, User.authenticate(:username => new_email, :password => "testtest")
end
# Check that the user can successfully recover their password
: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
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
: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")
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
+ assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name
follow_redirect!
end
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")
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
: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")
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
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
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
: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")
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
: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")
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
: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")
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
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
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
: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")
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
: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")
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
: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")
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 => "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
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
:email_confirmation => new_email,
:display_name => display_name,
:auth_provider => "microsoft",
- :pass_crypt => "",
- :pass_crypt_confirmation => "" } }
- assert_response :redirect
+ :pass_crypt => password,
+ :pass_crypt_confirmation => password,
+ :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_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
:display_name => display_name,
:auth_provider => "microsoft",
:pass_crypt => "",
- :pass_crypt_confirmation => "" } }
- assert_response :redirect
+ :pass_crypt_confirmation => "",
+ :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_response :redirect
assert_redirected_to auth_failure_path(:strategy => "microsoft", :message => "connection_failed", :origin => "/user/new")
follow_redirect!
assert_response :redirect
:email_confirmation => new_email,
:display_name => display_name,
:auth_provider => "microsoft",
- :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 => "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 => "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_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
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
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")
post response.location
- assert_response :redirect
assert_redirected_to auth_success_path(:provider => "github")
follow_redirect!
- assert_response :redirect
- assert_redirected_to "/user/terms"
- post "/user/save",
- :params => { :user => { :email => new_email,
- :email_confirmation => new_email,
- :display_name => display_name,
- :auth_provider => "github",
- :auth_uid => "123454321",
- :pass_crypt => password,
- :pass_crypt_confirmation => password },
- :read_ct => 1,
- :read_tou => 1 }
- assert_response :redirect
- assert_redirected_to :controller => :confirmations, :action => :confirm, :display_name => display_name
+ assert_redirected_to welcome_path
follow_redirect!
end
end
# Check the page
assert_response :success
- assert_template "confirmations/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")
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
: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")
post response.location
- assert_response :redirect
assert_redirected_to auth_success_path(:provider => "github")
follow_redirect!
- assert_response :redirect
- assert_redirected_to "/user/terms"
- post "/user/save",
- :params => { :user => { :email => new_email,
- :email_confirmation => new_email,
- :display_name => display_name,
- :auth_provider => "github",
- :auth_uid => "http://localhost:1123/new.tester",
- :pass_crypt => "testtest",
- :pass_crypt_confirmation => "testtest" },
- :read_ct => 1,
- :read_tou => 1 }
+ 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
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
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")
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 "/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 :controller => :confirmations, :action => :confirm, :display_name => display_name
+ assert_redirected_to welcome_path
follow_redirect!
end
end
# Check the page
assert_response :success
- assert_template "confirmations/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")
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
: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")
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 "/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
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
projects / rails.git / blobdiff