X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/446837c3511bf76f11b0d1e6d5a3ff79b69b0d70..f398c1e5eb35fa9e355544fb2860bc2ca9cfbe67:/test/controllers/accounts_controller_test.rb diff --git a/test/controllers/accounts_controller_test.rb b/test/controllers/accounts_controller_test.rb index 173bcf22c..1e39a7329 100644 --- a/test/controllers/accounts_controller_test.rb +++ b/test/controllers/accounts_controller_test.rb @@ -61,7 +61,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_template :edit assert_select ".notice", false - assert_select "form#accountForm > div.form-group > input.is-invalid#user_display_name" + assert_select "form#accountForm > div > input.is-invalid#user_display_name" # Changing name to one that exists should fail, regardless of case new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name.upcase) @@ -69,7 +69,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_template :edit assert_select ".notice", false - assert_select "form#accountForm > div.form-group > input.is-invalid#user_display_name" + assert_select "form#accountForm > div > input.is-invalid#user_display_name" # Changing name to one that doesn't exist should work new_attributes = user.attributes.dup.merge(:display_name => "new tester") @@ -80,7 +80,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_template :edit assert_select ".notice", /^User information updated successfully/ - assert_select "form#accountForm > div.form-group > input#user_display_name[value=?]", "new tester" + assert_select "form#accountForm > div > input#user_display_name[value=?]", "new tester" # Record the change of name user.display_name = "new tester" @@ -95,7 +95,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_template :edit assert_select ".notice", false - assert_select "form#accountForm > div.form-group > input.is-invalid#user_new_email" + assert_select "form#accountForm > div > input.is-invalid#user_new_email" # Changing email to one that exists should fail, regardless of case user.new_email = create(:user).email.upcase @@ -107,7 +107,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_template :edit assert_select ".notice", false - assert_select "form#accountForm > div.form-group > input.is-invalid#user_new_email" + assert_select "form#accountForm > div > input.is-invalid#user_new_email" # Changing email to one that doesn't exist should work user.new_email = "new_tester@example.com" @@ -122,7 +122,7 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_template :edit assert_select ".notice", /^User information updated successfully/ - assert_select "form#accountForm > div.form-group > input#user_new_email[value=?]", user.new_email + assert_select "form#accountForm > div > input#user_new_email[value=?]", user.new_email email = ActionMailer::Base.deliveries.first assert_equal 1, email.to.count assert_equal user.new_email, email.to.first