X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/550c4a3a45814fde5c809334c85f1ebc47659a82..42d4ed76e4ebb3dbef70956b4190ec77fe5e6214:/test/controllers/accounts_controller_test.rb diff --git a/test/controllers/accounts_controller_test.rb b/test/controllers/accounts_controller_test.rb index 173bcf22c..199bf4aab 100644 --- a/test/controllers/accounts_controller_test.rb +++ b/test/controllers/accounts_controller_test.rb @@ -5,16 +5,23 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest # test all routes which lead to this controller def test_routes assert_routing( - { :path => "/account/edit", :method => :get }, - { :controller => "accounts", :action => "edit" } + { :path => "/account", :method => :get }, + { :controller => "accounts", :action => "show" } ) assert_routing( { :path => "/account", :method => :put }, { :controller => "accounts", :action => "update" } ) + assert_routing( + { :path => "/account", :method => :delete }, + { :controller => "accounts", :action => "destroy" } + ) + + get "/account/edit" + assert_redirected_to "/account" end - def test_account + def test_show_and_update # Get a user to work with - note that this user deliberately # conflicts with uppercase_user in the email and display name # fields to test that we can change other fields without any @@ -24,15 +31,14 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest # Make sure that you are redirected to the login page when # you are not logged in - get edit_account_path - assert_response :redirect - assert_redirected_to login_path(:referer => "/account/edit") + get account_path + assert_redirected_to login_path(:referer => account_path) # Make sure we get the page when we are logged in as the right user session_for(user) - get edit_account_path + get account_path assert_response :success - assert_template :edit + assert_template :show assert_select "form#accountForm" do |form| assert_equal "post", form.attr("method").to_s assert_select "input[name='_method']", true @@ -42,45 +48,42 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest # Updating the description using GET should fail user.description = "new description" user.preferred_editor = "default" - get edit_account_path, :params => { :user => user.attributes } + get account_path, :params => { :user => user.attributes } assert_response :success - assert_template :edit + assert_template :show assert_not_equal user.description, User.find(user.id).description # Adding external authentication should redirect to the auth provider patch account_path, :params => { :user => user.attributes.merge(:auth_provider => "google") } - assert_response :redirect assert_redirected_to auth_path(:provider => "google", :origin => "/account") follow_redirect! - assert_response :redirect assert_redirected_to %r{^https://accounts.google.com/o/oauth2/auth\?.*} # Changing name to one that exists should fail new_attributes = user.attributes.dup.merge(:display_name => create(:user).display_name) patch account_path, :params => { :user => new_attributes } assert_response :success - assert_template :edit - assert_select ".notice", false - assert_select "form#accountForm > div.form-group > input.is-invalid#user_display_name" + assert_template :show + assert_select ".alert-success", false + 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) patch account_path, :params => { :user => new_attributes } assert_response :success - assert_template :edit - assert_select ".notice", false - assert_select "form#accountForm > div.form-group > input.is-invalid#user_display_name" + assert_template :show + assert_select ".alert-success", false + 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") patch account_path, :params => { :user => new_attributes } - assert_response :redirect - assert_redirected_to edit_account_url - get edit_account_path + assert_redirected_to account_path + follow_redirect! 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_template :show + assert_select ".alert-success", /^User information updated successfully/ + assert_select "form#accountForm > div > input#user_display_name[value=?]", "new tester" # Record the change of name user.display_name = "new tester" @@ -93,9 +96,9 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest end end assert_response :success - assert_template :edit - assert_select ".notice", false - assert_select "form#accountForm > div.form-group > input.is-invalid#user_new_email" + assert_template :show + assert_select ".alert-success", false + 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 @@ -105,9 +108,9 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest end end assert_response :success - assert_template :edit - assert_select ".notice", false - assert_select "form#accountForm > div.form-group > input.is-invalid#user_new_email" + assert_template :show + assert_select ".alert-success", false + 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" @@ -116,33 +119,30 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest patch account_path, :params => { :user => user.attributes } end end - assert_response :redirect - assert_redirected_to edit_account_url - get edit_account_path + assert_redirected_to account_path + follow_redirect! 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_template :show + assert_select ".alert-success", /^User information updated successfully/ + 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 - ActionMailer::Base.deliveries.clear end - def test_private_account + def test_show_private_account user = create(:user, :data_public => false) # Make sure that you are redirected to the login page when # you are not logged in - get edit_account_path - assert_response :redirect - assert_redirected_to login_path(:referer => "/account/edit") + get account_path + assert_redirected_to login_path(:referer => account_path) # Make sure we get the page when we are logged in as the right user session_for(user) - get edit_account_path + get account_path assert_response :success - assert_template :edit + assert_template :show assert_select "form#accountForm" do |form| assert_equal "post", form.attr("method").to_s assert_select "input[name='_method']", true @@ -152,4 +152,23 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest # Make sure we have a button to "go public" assert_select "form.button_to[action='/user/go_public']", true end + + def test_destroy_allowed + user = create(:user) + session_for(user) + + delete account_path + assert_response :redirect + end + + def test_destroy_not_allowed + with_user_account_deletion_delay(24) do + user = create(:user) + create(:changeset, :user => user, :created_at => Time.now.utc) + session_for(user) + + delete account_path + assert_response :bad_request + end + end end