Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/pull/4426'
Browse files Browse the repository at this point in the history
  • Loading branch information
@tomhughes
tomhughes committed Dec 20, 2023
2 parents e1d681d + abc58ed commit fb33267
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 115 deletions.
4 changes: 2 additions & 2 deletions config/settings/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ trace_file_storage: "test"
trace_image_storage: "test"
trace_icon_storage: "test"
# Lower some rate limits for testing
max_changeset_comments_per_hour: 30
moderator_changeset_comments_per_hour: 60
max_changeset_comments_per_hour: 10
moderator_changeset_comments_per_hour: 15
# Private key for signing id_tokens
doorkeeper_signing_key: |
-----BEGIN PRIVATE KEY-----
Expand Down
198 changes: 85 additions & 113 deletions test/integration/user_creation_test.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,149 +18,121 @@ def teardown
end

def test_create_user_form
I18n.with_locale "en" do
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
end
get "/user/new"
follow_redirect!
assert_response :success
assert_template "users/new"
end

def test_user_create_submit_duplicate_email
I18n.with_locale "en" do
Locale.available.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
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" } }
end
assert_response :success
assert_template "users/new"
assert_equal locale.to_s, response.headers["Content-Language"]
assert_select "form"
assert_select "form > div > input.is-invalid#user_email"
assert_no_missing_translations
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_submit_duplicate_username
I18n.with_locale "en" do
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
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
assert_response :success
assert_template "users/new"
assert_select "form > div > input.is-invalid#user_display_name"
assert_no_missing_translations
end
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.with_locale "en" do
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
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"

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
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
# 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_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"
# Check the page
assert_response :success
assert_template "confirmations/confirm"

ActionMailer::Base.deliveries.clear
end
end
ActionMailer::Base.deliveries.clear
end

def test_user_create_no_tou_failure
I18n.with_locale "en" do
I18n.available_locales.each do |locale|
new_email = "#{locale}newtester@osm.org"
display_name = "#{locale}_new_tester"

assert_difference("User.count", 0) do
assert_difference("ActionMailer::Base.deliveries.size", 0) do
perform_enqueued_jobs do
post "/user/new",
:params => { :user => { :email => new_email,
:email_confirmation => new_email,
:display_name => display_name,
:pass_crypt => "testtest",
:pass_crypt_confirmation => "testtest" } }
end
end
end

assert_redirected_to "/user/terms"
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/save",
:headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
assert_redirected_to "/user/terms"
post "/user/new",
:params => { :user => { :email => new_email,
:email_confirmation => new_email,
:display_name => display_name,
:pass_crypt => "testtest",
:pass_crypt_confirmation => "testtest" } }
end

ActionMailer::Base.deliveries.clear
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
Expand Down

0 comments on commit fb33267

Please sign in to comment.