X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a8e8ba1a64d4f82c74003b5fc05c6fc89a10cc65..20e03c73bb7755dec0c63a6beb40e747496d6e7b:/test/controllers/users_controller_test.rb?ds=inline diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 0a9a82f1c..402129d32 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -151,7 +151,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_template "new" - assert_select "form > div.form-group > input.is-invalid#user_email" + assert_select "form > div > input.is-invalid#user_email" end def test_save_duplicate_email @@ -180,7 +180,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_template "new" - assert_select "form > div.form-group > input.is-invalid#user_email" + assert_select "form > div > input.is-invalid#user_email" end def test_save_duplicate_email_uppercase @@ -209,7 +209,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_template "new" - assert_select "form > div.form-group > input.is-invalid#user_email" + assert_select "form > div > input.is-invalid#user_email" end def test_save_duplicate_name @@ -238,7 +238,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_template "new" - assert_select "form > div.form-group > input.is-invalid#user_display_name" + assert_select "form > div > input.is-invalid#user_display_name" end def test_save_duplicate_name_uppercase @@ -267,7 +267,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_response :success assert_template "new" - assert_select "form > div.form-group > input.is-invalid#user_display_name" + assert_select "form > div > input.is-invalid#user_display_name" end def test_save_blocked_domain @@ -495,6 +495,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks']", 0 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks_by']", 0 assert_select "a[href='/blocks/new/#{ERB::Util.u(user.display_name)}']", 0 + assert_select "a[href='/api/0.6/user/#{ERB::Util.u(user.id)}']", 0 end # Login as a moderator @@ -512,6 +513,7 @@ class UsersControllerTest < ActionDispatch::IntegrationTest assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks']", 0 assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/blocks_by']", 0 assert_select "a[href='/blocks/new/#{ERB::Util.u(user.display_name)}']", 1 + assert_select "a[href='/api/0.6/user/#{ERB::Util.u(user.id)}']", 1 end end @@ -529,7 +531,6 @@ class UsersControllerTest < ActionDispatch::IntegrationTest get user_path(seen_user) assert_response :success - # put @response.body assert_select "div.content-heading" do assert_select "dt", :count => 1, :text => /Contributor terms/ assert_select "dd", /Declined/ @@ -547,39 +548,39 @@ class UsersControllerTest < ActionDispatch::IntegrationTest user = create(:user) # Try without logging in - post set_status_user_path(user), :params => { :status => "suspended" } + post set_status_user_path(user), :params => { :event => "confirm" } assert_response :forbidden # Now try as a normal user session_for(user) - post set_status_user_path(user), :params => { :status => "suspended" } + post set_status_user_path(user), :params => { :event => "confirm" } assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden # Finally try as an administrator session_for(create(:administrator_user)) - post set_status_user_path(user), :params => { :status => "suspended" } + post set_status_user_path(user), :params => { :event => "confirm" } assert_response :redirect assert_redirected_to :action => :show, :display_name => user.display_name - assert_equal "suspended", User.find(user.id).status + assert_equal "confirmed", User.find(user.id).status end def test_destroy user = create(:user, :home_lat => 12.1, :home_lon => 12.1, :description => "test") # Try without logging in - delete user_path(user), :params => { :status => "suspended" } + delete user_path(user) assert_response :forbidden # Now try as a normal user session_for(user) - delete user_path(user), :params => { :status => "suspended" } + delete user_path(user) assert_response :redirect assert_redirected_to :controller => :errors, :action => :forbidden # Finally try as an administrator session_for(create(:administrator_user)) - delete user_path(user), :params => { :status => "suspended" } + delete user_path(user) assert_response :redirect assert_redirected_to :action => :show, :display_name => user.display_name