From 1d31573b0387958b0181b6c5c69543b440d55dd1 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Tue, 24 Dec 2024 06:44:00 +0300 Subject: [PATCH 1/6] Test active nav tabs on blocks_on/by pages --- test/controllers/user_blocks_controller_test.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/controllers/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb index 183bc9b7ba..fee8f4cb38 100644 --- a/test/controllers/user_blocks_controller_test.rb +++ b/test/controllers/user_blocks_controller_test.rb @@ -834,6 +834,7 @@ def test_blocks_on get user_blocks_on_path(blocked_user) assert_response :success assert_select "h1 a[href='#{user_path blocked_user}']", :text => blocked_user.display_name + assert_select "a.active[href='#{user_blocks_on_path blocked_user}']" assert_select "table#block_list tbody", :count => 1 do assert_select "tr", 2 assert_select "a[href='#{user_block_path(active_block)}']", 1 @@ -844,6 +845,7 @@ def test_blocks_on get user_blocks_on_path(unblocked_user) assert_response :success assert_select "h1 a[href='#{user_path unblocked_user}']", :text => unblocked_user.display_name + assert_select "a.active[href='#{user_blocks_on_path unblocked_user}']" assert_select "table#block_list tbody", :count => 1 do assert_select "tr", 1 assert_select "a[href='#{user_block_path(expired_block)}']", 1 @@ -910,6 +912,7 @@ def test_blocks_by get user_blocks_by_path(moderator_user) assert_response :success assert_select "h1 a[href='#{user_path moderator_user}']", :text => moderator_user.display_name + assert_select "a.active[href='#{user_blocks_by_path moderator_user}']" assert_select "table#block_list tbody", :count => 1 do assert_select "tr", 1 assert_select "a[href='#{user_block_path(active_block)}']", 1 @@ -919,6 +922,7 @@ def test_blocks_by get user_blocks_by_path(second_moderator_user) assert_response :success assert_select "h1 a[href='#{user_path second_moderator_user}']", :text => second_moderator_user.display_name + assert_select "a.active[href='#{user_blocks_by_path second_moderator_user}']" assert_select "table#block_list tbody", :count => 1 do assert_select "tr", 2 assert_select "a[href='#{user_block_path(expired_block)}']", 1 From 3b0748831aa249b2beeb593641dfec06f980b6c8 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Tue, 24 Dec 2024 00:58:57 +0300 Subject: [PATCH 2/6] Declare new block path on resources --- config/routes.rb | 3 +-- test/controllers/user_blocks_controller_test.rb | 2 +- test/controllers/users_controller_test.rb | 10 +++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 0e00da9e3b..ccc32c7733 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -332,8 +332,7 @@ # banning pages get "/user/:display_name/blocks" => "user_blocks#blocks_on", :as => "user_blocks_on" get "/user/:display_name/blocks_by" => "user_blocks#blocks_by", :as => "user_blocks_by" - get "/blocks/new/:display_name" => "user_blocks#new", :as => "new_user_block" - resources :user_blocks, :except => :new + resources :user_blocks, :path_names => { :new => "new/:display_name" } match "/user/:display_name/blocks/revoke_all" => "user_blocks#revoke_all", :via => [:get, :post], :as => "revoke_all_user_blocks" # issues and reports diff --git a/test/controllers/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb index fee8f4cb38..ff789e7aac 100644 --- a/test/controllers/user_blocks_controller_test.rb +++ b/test/controllers/user_blocks_controller_test.rb @@ -5,7 +5,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest # test all routes which lead to this controller def test_routes assert_routing( - { :path => "/blocks/new/username", :method => :get }, + { :path => "/user_blocks/new/username", :method => :get }, { :controller => "user_blocks", :action => "new", :display_name => "username" } ) diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 732745539a..ba1af9509e 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -305,7 +305,7 @@ def test_show assert_select "a[href='/user/#{ERB::Util.u(user.display_name)}/account']", 0 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='/user_blocks/new/#{ERB::Util.u(user.display_name)}']", 0 end # Test a user who has been blocked @@ -321,7 +321,7 @@ def test_show assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/account']", 0 assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/blocks']", 1 assert_select "a[href='/user/#{ERB::Util.u(blocked_user.display_name)}/blocks_by']", 0 - assert_select "a[href='/blocks/new/#{ERB::Util.u(blocked_user.display_name)}']", 0 + assert_select "a[href='/user_blocks/new/#{ERB::Util.u(blocked_user.display_name)}']", 0 end # Test a moderator who has applied blocks @@ -337,7 +337,7 @@ def test_show assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/account']", 0 assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/blocks']", 0 assert_select "a[href='/user/#{ERB::Util.u(moderator_user.display_name)}/blocks_by']", 1 - assert_select "a[href='/blocks/new/#{ERB::Util.u(moderator_user.display_name)}']", 0 + assert_select "a[href='/user_blocks/new/#{ERB::Util.u(moderator_user.display_name)}']", 0 end # Login as a normal user @@ -354,7 +354,7 @@ def test_show assert_select "a[href='/account/edit']", 1 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='/user_blocks/new/#{ERB::Util.u(user.display_name)}']", 0 assert_select "a[href='/api/0.6/user/#{ERB::Util.u(user.id)}']", 0 end @@ -372,7 +372,7 @@ def test_show assert_select "a[href='/account/edit']", 0 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='/user_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 From 0b755d8630696b499a0705d175e78fef0909df92 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Tue, 24 Dec 2024 02:47:19 +0300 Subject: [PATCH 3/6] Create blocks table test helper module --- .../user_blocks/table_test_helper.rb | 24 +++++++++++++++++++ .../user_blocks_controller_test.rb | 22 +++-------------- 2 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 test/controllers/user_blocks/table_test_helper.rb diff --git a/test/controllers/user_blocks/table_test_helper.rb b/test/controllers/user_blocks/table_test_helper.rb new file mode 100644 index 0000000000..3506c31bb6 --- /dev/null +++ b/test/controllers/user_blocks/table_test_helper.rb @@ -0,0 +1,24 @@ +module UserBlocks + module TableTestHelper + private + + def check_user_blocks_table(user_blocks) + assert_dom "table#block_list tbody tr" do |rows| + assert_equal user_blocks.count, rows.count, "unexpected number of rows in user blocks table" + rows.zip(user_blocks).map do |row, user_block| + assert_dom row, "a[href='#{user_block_path user_block}']", 1 + end + end + end + + def check_no_page_link(name) + assert_select "a.page-link", { :text => /#{Regexp.quote(name)}/, :count => 0 }, "unexpected #{name} page link" + end + + def check_page_link(name) + assert_select "a.page-link", { :text => /#{Regexp.quote(name)}/ }, "missing #{name} page link" do |buttons| + return buttons.first.attributes["href"].value + end + end + end +end diff --git a/test/controllers/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb index ff789e7aac..2b2238b614 100644 --- a/test/controllers/user_blocks_controller_test.rb +++ b/test/controllers/user_blocks_controller_test.rb @@ -1,6 +1,9 @@ require "test_helper" +require_relative "user_blocks/table_test_helper" class UserBlocksControllerTest < ActionDispatch::IntegrationTest + include UserBlocks::TableTestHelper + ## # test all routes which lead to this controller def test_routes @@ -1029,23 +1032,4 @@ def check_inactive_block_updates(block) assert_equal "Updated Reason Again", block.reason assert_equal original_ends_at, block.ends_at end - - def check_user_blocks_table(user_blocks) - assert_dom "table#block_list tbody tr" do |rows| - assert_equal user_blocks.count, rows.count, "unexpected number of rows in user blocks table" - rows.zip(user_blocks).map do |row, user_block| - assert_dom row, "a[href='#{user_block_path user_block}']", 1 - end - end - end - - def check_no_page_link(name) - assert_select "a.page-link", { :text => /#{Regexp.quote(name)}/, :count => 0 }, "unexpected #{name} page link" - end - - def check_page_link(name) - assert_select "a.page-link", { :text => /#{Regexp.quote(name)}/ }, "missing #{name} page link" do |buttons| - return buttons.first.attributes["href"].value - end - end end From 7a4115f090c6a6f923b2fe31b505982ac006e992 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Tue, 24 Dec 2024 02:51:45 +0300 Subject: [PATCH 4/6] Create issued blocks resource --- .rubocop_todo.yml | 1 + app/abilities/ability.rb | 2 +- app/controllers/user_blocks_controller.rb | 17 +--- .../users/issued_blocks_controller.rb | 31 ++++++ app/views/user_blocks/_navigation.html.erb | 8 +- app/views/user_blocks/_page.html.erb | 3 +- .../issued_blocks/show.html.erb} | 4 +- app/views/users/show.html.erb | 4 +- config/locales/en.yml | 9 +- config/routes.rb | 4 +- .../user_blocks_controller_test.rb | 88 ----------------- .../users/issued_blocks_controller_test.rb | 95 +++++++++++++++++++ 12 files changed, 147 insertions(+), 119 deletions(-) create mode 100644 app/controllers/users/issued_blocks_controller.rb rename app/views/{user_blocks/blocks_by.html.erb => users/issued_blocks/show.html.erb} (77%) create mode 100644 test/controllers/users/issued_blocks_controller_test.rb diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 071abc44c3..100a199c85 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -27,6 +27,7 @@ FactoryBot/ExcessiveCreateList: - 'test/controllers/notes_controller_test.rb' - 'test/controllers/traces_controller_test.rb' - 'test/controllers/user_blocks_controller_test.rb' + - 'test/controllers/users/issued_blocks_controller_test.rb' - 'test/system/users_test.rb' # Offense count: 635 diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb index e4b9dcf6bf..d0b4997b2e 100644 --- a/app/abilities/ability.rb +++ b/app/abilities/ability.rb @@ -24,7 +24,7 @@ def initialize(user) can [:create, :destroy], :session can [:read, :data, :georss], Trace can [:read, :terms, :create, :save, :suspended, :auth_success, :auth_failure], User - can [:read, :blocks_on, :blocks_by], UserBlock + can [:read, :blocks_on], UserBlock end if user&.active? diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb index 5513717942..ccb07ea599 100644 --- a/app/controllers/user_blocks_controller.rb +++ b/app/controllers/user_blocks_controller.rb @@ -9,7 +9,7 @@ class UserBlocksController < ApplicationController authorize_resource - before_action :lookup_user, :only => [:new, :create, :revoke_all, :blocks_on, :blocks_by] + before_action :lookup_user, :only => [:new, :create, :revoke_all, :blocks_on] before_action :lookup_user_block, :only => [:show, :edit, :update] before_action :require_valid_params, :only => [:create, :update] before_action :check_database_readable @@ -130,21 +130,6 @@ def blocks_on render :partial => "page" if turbo_frame_request_id == "pagination" end - ## - # shows a list of all the blocks by the given user. - def blocks_by - @params = params.permit(:display_name) - - user_blocks = UserBlock.where(:creator => @user) - - @user_blocks, @newer_user_blocks_id, @older_user_blocks_id = get_page_items(user_blocks, :includes => [:user, :creator, :revoker]) - - @show_user_name = true - @show_creator_name = false - - render :partial => "page" if turbo_frame_request_id == "pagination" - end - private ## diff --git a/app/controllers/users/issued_blocks_controller.rb b/app/controllers/users/issued_blocks_controller.rb new file mode 100644 index 0000000000..b533b5f6df --- /dev/null +++ b/app/controllers/users/issued_blocks_controller.rb @@ -0,0 +1,31 @@ +module Users + class IssuedBlocksController < ApplicationController + include UserMethods + include PaginationMethods + + layout "site" + + before_action :authorize_web + before_action :set_locale + + authorize_resource :class => UserBlock + + before_action :lookup_user + before_action :check_database_readable + + ## + # shows a list of all the blocks by the given user. + def show + @params = params.permit(:user_display_name) + + user_blocks = UserBlock.where(:creator => @user) + + @user_blocks, @newer_user_blocks_id, @older_user_blocks_id = get_page_items(user_blocks, :includes => [:user, :creator, :revoker]) + + @show_user_name = true + @show_creator_name = false + + render :partial => "user_blocks/page" if turbo_frame_request_id == "pagination" + end + end +end diff --git a/app/views/user_blocks/_navigation.html.erb b/app/views/user_blocks/_navigation.html.erb index 0770e331fd..cd79e4f229 100644 --- a/app/views/user_blocks/_navigation.html.erb +++ b/app/views/user_blocks/_navigation.html.erb @@ -22,16 +22,16 @@ <% if current_user&.blocks_created&.exists? %> <% end %> <% by_user = @user || @user_block&.creator %> <% if by_user != current_user && by_user&.blocks_created&.exists? %> <% end %> <% if @user_block&.persisted? %> diff --git a/app/views/user_blocks/_page.html.erb b/app/views/user_blocks/_page.html.erb index c2e516170a..fa9f0b2d2d 100644 --- a/app/views/user_blocks/_page.html.erb +++ b/app/views/user_blocks/_page.html.erb @@ -16,10 +16,11 @@ - <%= render :partial => "block", :collection => @user_blocks %> + <%= render :partial => "user_blocks/block", :collection => @user_blocks %> <%= render "shared/pagination", + :translation_scope => "shared.pagination.user_blocks", :newer_id => @newer_user_blocks_id, :older_id => @older_user_blocks_id %> diff --git a/app/views/user_blocks/blocks_by.html.erb b/app/views/users/issued_blocks/show.html.erb similarity index 77% rename from app/views/user_blocks/blocks_by.html.erb rename to app/views/users/issued_blocks/show.html.erb index 73748e5570..ada2a568fe 100644 --- a/app/views/user_blocks/blocks_by.html.erb +++ b/app/views/users/issued_blocks/show.html.erb @@ -3,11 +3,11 @@ <% content_for :heading_class, "pb-0" %> <% content_for :heading do %>

<%= t(".heading_html", :name => link_to(@user.display_name, @user)) %>

- <%= render :partial => "navigation" %> + <%= render :partial => "user_blocks/navigation" %> <% end %> <% unless @user_blocks.empty? %> -<%= render :partial => "page" %> +<%= render :partial => "user_blocks/page" %> <% else %>

<%= t ".empty", :name => @user.display_name %>

<% end %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index f392245022..5e8398b162 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -42,7 +42,7 @@ <% if can?(:create, UserBlock) and current_user.blocks_created.exists? %>
  • - <%= link_to t(".blocks by me"), user_blocks_by_path(current_user) %> + <%= link_to t(".blocks by me"), user_issued_blocks_path(current_user) %> <%= number_with_delimiter(current_user.blocks_created.active.size) %>
  • <% end %> @@ -100,7 +100,7 @@ <% if @user.moderator? and @user.blocks_created.exists? %>
  • - <%= link_to t(".moderator_history"), user_blocks_by_path(@user) %> + <%= link_to t(".moderator_history"), user_issued_blocks_path(@user) %> <%= number_with_delimiter(@user.blocks_created.active.size) %>
  • <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 7faf3bebcf..387f82757f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2846,6 +2846,11 @@ en: report: Report this User go_public: flash success: "All your edits are now public, and you are now allowed to edit." + issued_blocks: + show: + title: "Blocks by %{name}" + heading_html: "List of Blocks by %{name}" + empty: "%{name} has not made any blocks yet." lists: show: title: Users @@ -2966,10 +2971,6 @@ en: title: "Blocks on %{name}" heading_html: "List of Blocks on %{name}" empty: "%{name} has not been blocked yet." - blocks_by: - title: "Blocks by %{name}" - heading_html: "List of Blocks by %{name}" - empty: "%{name} has not made any blocks yet." show: title: "%{block_on} blocked by %{block_by}" heading_html: "%{block_on} blocked by %{block_by}" diff --git a/config/routes.rb b/config/routes.rb index ccc32c7733..7ecb200da4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -271,6 +271,9 @@ # user pages resources :users, :path => "user", :param => :display_name, :only => [:show, :destroy] do resource :role, :controller => "user_roles", :path => "roles/:role", :only => [:create, :destroy] + scope :module => :users do + resource :issued_blocks, :path => "blocks_by", :only => :show + end end get "/user/:display_name/account", :to => redirect(:path => "/account/edit") post "/user/:display_name/set_status" => "users#set_status", :as => :set_status_user @@ -331,7 +334,6 @@ # banning pages get "/user/:display_name/blocks" => "user_blocks#blocks_on", :as => "user_blocks_on" - get "/user/:display_name/blocks_by" => "user_blocks#blocks_by", :as => "user_blocks_by" resources :user_blocks, :path_names => { :new => "new/:display_name" } match "/user/:display_name/blocks/revoke_all" => "user_blocks#revoke_all", :via => [:get, :post], :as => "revoke_all_user_blocks" diff --git a/test/controllers/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb index 2b2238b614..1c48448e0b 100644 --- a/test/controllers/user_blocks_controller_test.rb +++ b/test/controllers/user_blocks_controller_test.rb @@ -41,10 +41,6 @@ def test_routes { :path => "/user/username/blocks", :method => :get }, { :controller => "user_blocks", :action => "blocks_on", :display_name => "username" } ) - assert_routing( - { :path => "/user/username/blocks_by", :method => :get }, - { :controller => "user_blocks", :action => "blocks_by", :display_name => "username" } - ) assert_routing( { :path => "/user/username/blocks/revoke_all", :method => :get }, { :controller => "user_blocks", :action => "revoke_all", :display_name => "username" } @@ -895,90 +891,6 @@ def test_blocks_on_invalid_paged end end - ## - # test the blocks_by action - def test_blocks_by - moderator_user = create(:moderator_user) - second_moderator_user = create(:moderator_user) - normal_user = create(:user) - active_block = create(:user_block, :creator => moderator_user) - expired_block = create(:user_block, :expired, :creator => second_moderator_user) - revoked_block = create(:user_block, :revoked, :creator => second_moderator_user) - - # Asking for a list of blocks with a bogus user name should fail - get user_blocks_by_path("non_existent_user") - assert_response :not_found - assert_template "users/no_such_user" - assert_select "h1", "The user non_existent_user does not exist" - - # Check the list of blocks given by one moderator - get user_blocks_by_path(moderator_user) - assert_response :success - assert_select "h1 a[href='#{user_path moderator_user}']", :text => moderator_user.display_name - assert_select "a.active[href='#{user_blocks_by_path moderator_user}']" - assert_select "table#block_list tbody", :count => 1 do - assert_select "tr", 1 - assert_select "a[href='#{user_block_path(active_block)}']", 1 - end - - # Check the list of blocks given by a different moderator - get user_blocks_by_path(second_moderator_user) - assert_response :success - assert_select "h1 a[href='#{user_path second_moderator_user}']", :text => second_moderator_user.display_name - assert_select "a.active[href='#{user_blocks_by_path second_moderator_user}']" - assert_select "table#block_list tbody", :count => 1 do - assert_select "tr", 2 - assert_select "a[href='#{user_block_path(expired_block)}']", 1 - assert_select "a[href='#{user_block_path(revoked_block)}']", 1 - end - - # Check the list of blocks (not) given by a normal user - get user_blocks_by_path(normal_user) - assert_response :success - assert_select "table#block_list", false - assert_select "p", "#{normal_user.display_name} has not made any blocks yet." - end - - ## - # test the blocks_by action with multiple pages - def test_blocks_by_paged - user = create(:moderator_user) - user_blocks = create_list(:user_block, 50, :creator => user).reverse - next_path = user_blocks_by_path(user) - - get next_path - assert_response :success - check_user_blocks_table user_blocks[0...20] - check_no_page_link "Newer Blocks" - next_path = check_page_link "Older Blocks" - - get next_path - assert_response :success - check_user_blocks_table user_blocks[20...40] - check_page_link "Newer Blocks" - next_path = check_page_link "Older Blocks" - - get next_path - assert_response :success - check_user_blocks_table user_blocks[40...50] - check_page_link "Newer Blocks" - check_no_page_link "Older Blocks" - end - - ## - # test the blocks_by action with invalid pages - def test_blocks_by_invalid_paged - user = create(:moderator_user) - - %w[-1 0 fred].each do |id| - get user_blocks_by_path(user, :before => id) - assert_redirected_to :controller => :errors, :action => :bad_request - - get user_blocks_by_path(user, :after => id) - assert_redirected_to :controller => :errors, :action => :bad_request - end - end - private def check_block_buttons(block, edit: 0) diff --git a/test/controllers/users/issued_blocks_controller_test.rb b/test/controllers/users/issued_blocks_controller_test.rb new file mode 100644 index 0000000000..4fab264e9d --- /dev/null +++ b/test/controllers/users/issued_blocks_controller_test.rb @@ -0,0 +1,95 @@ +require "test_helper" +require_relative "../user_blocks/table_test_helper" + +module Users + class IssuedBlocksControllerTest < ActionDispatch::IntegrationTest + include UserBlocks::TableTestHelper + + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/user/username/blocks_by", :method => :get }, + { :controller => "users/issued_blocks", :action => "show", :user_display_name => "username" } + ) + end + + def test_show + moderator_user = create(:moderator_user) + second_moderator_user = create(:moderator_user) + normal_user = create(:user) + active_block = create(:user_block, :creator => moderator_user) + expired_block = create(:user_block, :expired, :creator => second_moderator_user) + revoked_block = create(:user_block, :revoked, :creator => second_moderator_user) + + # Asking for a list of blocks with a bogus user name should fail + get user_issued_blocks_path("non_existent_user") + assert_response :not_found + assert_template "users/no_such_user" + assert_select "h1", "The user non_existent_user does not exist" + + # Check the list of blocks given by one moderator + get user_issued_blocks_path(moderator_user) + assert_response :success + assert_select "h1 a[href='#{user_path moderator_user}']", :text => moderator_user.display_name + assert_select "a.active[href='#{user_issued_blocks_path moderator_user}']" + assert_select "table#block_list tbody", :count => 1 do + assert_select "tr", 1 + assert_select "a[href='#{user_block_path(active_block)}']", 1 + end + + # Check the list of blocks given by a different moderator + get user_issued_blocks_path(second_moderator_user) + assert_response :success + assert_select "h1 a[href='#{user_path second_moderator_user}']", :text => second_moderator_user.display_name + assert_select "a.active[href='#{user_issued_blocks_path second_moderator_user}']" + assert_select "table#block_list tbody", :count => 1 do + assert_select "tr", 2 + assert_select "a[href='#{user_block_path(expired_block)}']", 1 + assert_select "a[href='#{user_block_path(revoked_block)}']", 1 + end + + # Check the list of blocks (not) given by a normal user + get user_issued_blocks_path(normal_user) + assert_response :success + assert_select "table#block_list", false + assert_select "p", "#{normal_user.display_name} has not made any blocks yet." + end + + def test_show_paged + user = create(:moderator_user) + user_blocks = create_list(:user_block, 50, :creator => user).reverse + next_path = user_issued_blocks_path(user) + + get next_path + assert_response :success + check_user_blocks_table user_blocks[0...20] + check_no_page_link "Newer Blocks" + next_path = check_page_link "Older Blocks" + + get next_path + assert_response :success + check_user_blocks_table user_blocks[20...40] + check_page_link "Newer Blocks" + next_path = check_page_link "Older Blocks" + + get next_path + assert_response :success + check_user_blocks_table user_blocks[40...50] + check_page_link "Newer Blocks" + check_no_page_link "Older Blocks" + end + + def test_show_invalid_paged + user = create(:moderator_user) + + %w[-1 0 fred].each do |id| + get user_issued_blocks_path(user, :before => id) + assert_redirected_to :controller => "/errors", :action => :bad_request + + get user_issued_blocks_path(user, :after => id) + assert_redirected_to :controller => "/errors", :action => :bad_request + end + end + end +end From 2df389c97e52437f964e4b4ee22c8493a9cc7fbc Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Tue, 24 Dec 2024 06:07:59 +0300 Subject: [PATCH 5/6] Create received blocks resource --- .rubocop_todo.yml | 1 + app/abilities/ability.rb | 2 +- app/controllers/user_blocks_controller.rb | 19 +--- .../users/received_blocks_controller.rb | 31 ++++++ app/views/user_blocks/_navigation.html.erb | 8 +- .../received_blocks/show.html.erb} | 4 +- app/views/users/show.html.erb | 4 +- config/locales/en.yml | 9 +- config/routes.rb | 2 +- .../user_blocks_controller_test.rb | 92 +----------------- .../users/received_blocks_controller_test.rb | 95 +++++++++++++++++++ 11 files changed, 146 insertions(+), 121 deletions(-) create mode 100644 app/controllers/users/received_blocks_controller.rb rename app/views/{user_blocks/blocks_on.html.erb => users/received_blocks/show.html.erb} (77%) create mode 100644 test/controllers/users/received_blocks_controller_test.rb diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 100a199c85..041b7ef5ec 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -28,6 +28,7 @@ FactoryBot/ExcessiveCreateList: - 'test/controllers/traces_controller_test.rb' - 'test/controllers/user_blocks_controller_test.rb' - 'test/controllers/users/issued_blocks_controller_test.rb' + - 'test/controllers/users/received_blocks_controller_test.rb' - 'test/system/users_test.rb' # Offense count: 635 diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb index d0b4997b2e..fe899d09dd 100644 --- a/app/abilities/ability.rb +++ b/app/abilities/ability.rb @@ -24,7 +24,7 @@ def initialize(user) can [:create, :destroy], :session can [:read, :data, :georss], Trace can [:read, :terms, :create, :save, :suspended, :auth_success, :auth_failure], User - can [:read, :blocks_on], UserBlock + can :read, UserBlock end if user&.active? diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb index ccb07ea599..81b0cbcbac 100644 --- a/app/controllers/user_blocks_controller.rb +++ b/app/controllers/user_blocks_controller.rb @@ -9,7 +9,7 @@ class UserBlocksController < ApplicationController authorize_resource - before_action :lookup_user, :only => [:new, :create, :revoke_all, :blocks_on] + before_action :lookup_user, :only => [:new, :create, :revoke_all] before_action :lookup_user_block, :only => [:show, :edit, :update] before_action :require_valid_params, :only => [:create, :update] before_action :check_database_readable @@ -111,25 +111,10 @@ def revoke_all if request.post? && params[:confirm] @user.blocks.active.each { |block| block.revoke!(current_user) } flash[:notice] = t ".flash" - redirect_to user_blocks_on_path(@user) + redirect_to user_received_blocks_path(@user) end end - ## - # shows a list of all the blocks on the given user - def blocks_on - @params = params.permit(:display_name) - - user_blocks = UserBlock.where(:user => @user) - - @user_blocks, @newer_user_blocks_id, @older_user_blocks_id = get_page_items(user_blocks, :includes => [:user, :creator, :revoker]) - - @show_user_name = false - @show_creator_name = true - - render :partial => "page" if turbo_frame_request_id == "pagination" - end - private ## diff --git a/app/controllers/users/received_blocks_controller.rb b/app/controllers/users/received_blocks_controller.rb new file mode 100644 index 0000000000..a47b56a58c --- /dev/null +++ b/app/controllers/users/received_blocks_controller.rb @@ -0,0 +1,31 @@ +module Users + class ReceivedBlocksController < ApplicationController + include UserMethods + include PaginationMethods + + layout "site" + + before_action :authorize_web + before_action :set_locale + + authorize_resource :class => UserBlock + + before_action :lookup_user + before_action :check_database_readable + + ## + # shows a list of all the blocks on the given user + def show + @params = params.permit(:user_display_name) + + user_blocks = UserBlock.where(:user => @user) + + @user_blocks, @newer_user_blocks_id, @older_user_blocks_id = get_page_items(user_blocks, :includes => [:user, :creator, :revoker]) + + @show_user_name = false + @show_creator_name = true + + render :partial => "user_blocks/page" if turbo_frame_request_id == "pagination" + end + end +end diff --git a/app/views/user_blocks/_navigation.html.erb b/app/views/user_blocks/_navigation.html.erb index cd79e4f229..891315e6eb 100644 --- a/app/views/user_blocks/_navigation.html.erb +++ b/app/views/user_blocks/_navigation.html.erb @@ -7,16 +7,16 @@ <% if current_user&.blocks&.exists? %> <% end %> <% on_user = @user || @user_block&.user %> <% if on_user != current_user && on_user&.blocks&.exists? %> <% end %> <% if current_user&.blocks_created&.exists? %> diff --git a/app/views/user_blocks/blocks_on.html.erb b/app/views/users/received_blocks/show.html.erb similarity index 77% rename from app/views/user_blocks/blocks_on.html.erb rename to app/views/users/received_blocks/show.html.erb index 73748e5570..ada2a568fe 100644 --- a/app/views/user_blocks/blocks_on.html.erb +++ b/app/views/users/received_blocks/show.html.erb @@ -3,11 +3,11 @@ <% content_for :heading_class, "pb-0" %> <% content_for :heading do %>

    <%= t(".heading_html", :name => link_to(@user.display_name, @user)) %>

    - <%= render :partial => "navigation" %> + <%= render :partial => "user_blocks/navigation" %> <% end %> <% unless @user_blocks.empty? %> -<%= render :partial => "page" %> +<%= render :partial => "user_blocks/page" %> <% else %>

    <%= t ".empty", :name => @user.display_name %>

    <% end %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 5e8398b162..8b09c751e4 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -35,7 +35,7 @@ <% if current_user.blocks.exists? %>
  • - <%= link_to t(".blocks on me"), user_blocks_on_path(current_user) %> + <%= link_to t(".blocks on me"), user_received_blocks_path(current_user) %> <%= number_with_delimiter(current_user.blocks.active.size) %>
  • <% end %> @@ -93,7 +93,7 @@ <% if @user.blocks.exists? %>
  • - <%= link_to t(".block_history"), user_blocks_on_path(@user) %> + <%= link_to t(".block_history"), user_received_blocks_path(@user) %> <%= number_with_delimiter(@user.blocks.active.size) %>
  • <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 387f82757f..e4489ff600 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2851,6 +2851,11 @@ en: title: "Blocks by %{name}" heading_html: "List of Blocks by %{name}" empty: "%{name} has not made any blocks yet." + received_blocks: + show: + title: "Blocks on %{name}" + heading_html: "List of Blocks on %{name}" + empty: "%{name} has not been blocked yet." lists: show: title: Users @@ -2967,10 +2972,6 @@ en: read_html: "read at %{time}" time_in_future_title: "%{time_absolute}; in %{time_relative}" time_in_past_title: "%{time_absolute}; %{time_relative}" - blocks_on: - title: "Blocks on %{name}" - heading_html: "List of Blocks on %{name}" - empty: "%{name} has not been blocked yet." show: title: "%{block_on} blocked by %{block_by}" heading_html: "%{block_on} blocked by %{block_by}" diff --git a/config/routes.rb b/config/routes.rb index 7ecb200da4..806e4ba855 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -273,6 +273,7 @@ resource :role, :controller => "user_roles", :path => "roles/:role", :only => [:create, :destroy] scope :module => :users do resource :issued_blocks, :path => "blocks_by", :only => :show + resource :received_blocks, :path => "blocks", :only => :show end end get "/user/:display_name/account", :to => redirect(:path => "/account/edit") @@ -333,7 +334,6 @@ resources :user_mutes, :only => [:index] # banning pages - get "/user/:display_name/blocks" => "user_blocks#blocks_on", :as => "user_blocks_on" resources :user_blocks, :path_names => { :new => "new/:display_name" } match "/user/:display_name/blocks/revoke_all" => "user_blocks#revoke_all", :via => [:get, :post], :as => "revoke_all_user_blocks" diff --git a/test/controllers/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb index 1c48448e0b..0b9c82f6a2 100644 --- a/test/controllers/user_blocks_controller_test.rb +++ b/test/controllers/user_blocks_controller_test.rb @@ -37,10 +37,6 @@ def test_routes { :controller => "user_blocks", :action => "destroy", :id => "1" } ) - assert_routing( - { :path => "/user/username/blocks", :method => :get }, - { :controller => "user_blocks", :action => "blocks_on", :display_name => "username" } - ) assert_routing( { :path => "/user/username/blocks/revoke_all", :method => :get }, { :controller => "user_blocks", :action => "revoke_all", :display_name => "username" } @@ -609,7 +605,7 @@ def test_revoke_all_page create(:user_block, :user => blocked_user) # Asking for the revoke all blocks page with a bogus user name should fail - get user_blocks_on_path("non_existent_user") + get user_received_blocks_path("non_existent_user") assert_response :not_found # Check that the revoke all blocks page requires us to login @@ -668,7 +664,7 @@ def test_revoke_all_action # Check that revoking blocks works using POST post revoke_all_user_blocks_path(blocked_user, :confirm => true) - assert_redirected_to user_blocks_on_path(blocked_user) + assert_redirected_to user_received_blocks_path(blocked_user) blocks.each(&:reload) assert_not_predicate active_block1, :active? @@ -807,90 +803,6 @@ def test_update_legacy_deactivates_at end end - ## - # test the blocks_on action - def test_blocks_on - blocked_user = create(:user) - unblocked_user = create(:user) - normal_user = create(:user) - active_block = create(:user_block, :user => blocked_user) - revoked_block = create(:user_block, :revoked, :user => blocked_user) - expired_block = create(:user_block, :expired, :user => unblocked_user) - - # Asking for a list of blocks with a bogus user name should fail - get user_blocks_on_path("non_existent_user") - assert_response :not_found - assert_template "users/no_such_user" - assert_select "h1", "The user non_existent_user does not exist" - - # Check the list of blocks for a user that has never been blocked - get user_blocks_on_path(normal_user) - assert_response :success - assert_select "table#block_list", false - assert_select "p", "#{normal_user.display_name} has not been blocked yet." - - # Check the list of blocks for a user that is currently blocked - get user_blocks_on_path(blocked_user) - assert_response :success - assert_select "h1 a[href='#{user_path blocked_user}']", :text => blocked_user.display_name - assert_select "a.active[href='#{user_blocks_on_path blocked_user}']" - assert_select "table#block_list tbody", :count => 1 do - assert_select "tr", 2 - assert_select "a[href='#{user_block_path(active_block)}']", 1 - assert_select "a[href='#{user_block_path(revoked_block)}']", 1 - end - - # Check the list of blocks for a user that has previously been blocked - get user_blocks_on_path(unblocked_user) - assert_response :success - assert_select "h1 a[href='#{user_path unblocked_user}']", :text => unblocked_user.display_name - assert_select "a.active[href='#{user_blocks_on_path unblocked_user}']" - assert_select "table#block_list tbody", :count => 1 do - assert_select "tr", 1 - assert_select "a[href='#{user_block_path(expired_block)}']", 1 - end - end - - ## - # test the blocks_on action with multiple pages - def test_blocks_on_paged - user = create(:user) - user_blocks = create_list(:user_block, 50, :user => user).reverse - next_path = user_blocks_on_path(user) - - get next_path - assert_response :success - check_user_blocks_table user_blocks[0...20] - check_no_page_link "Newer Blocks" - next_path = check_page_link "Older Blocks" - - get next_path - assert_response :success - check_user_blocks_table user_blocks[20...40] - check_page_link "Newer Blocks" - next_path = check_page_link "Older Blocks" - - get next_path - assert_response :success - check_user_blocks_table user_blocks[40...50] - check_page_link "Newer Blocks" - check_no_page_link "Older Blocks" - end - - ## - # test the blocks_on action with invalid pages - def test_blocks_on_invalid_paged - user = create(:user) - - %w[-1 0 fred].each do |id| - get user_blocks_on_path(user, :before => id) - assert_redirected_to :controller => :errors, :action => :bad_request - - get user_blocks_on_path(user, :after => id) - assert_redirected_to :controller => :errors, :action => :bad_request - end - end - private def check_block_buttons(block, edit: 0) diff --git a/test/controllers/users/received_blocks_controller_test.rb b/test/controllers/users/received_blocks_controller_test.rb new file mode 100644 index 0000000000..b254f9ec30 --- /dev/null +++ b/test/controllers/users/received_blocks_controller_test.rb @@ -0,0 +1,95 @@ +require "test_helper" +require_relative "../user_blocks/table_test_helper" + +module Users + class ReceivedBlocksControllerTest < ActionDispatch::IntegrationTest + include UserBlocks::TableTestHelper + + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/user/username/blocks", :method => :get }, + { :controller => "users/received_blocks", :action => "show", :user_display_name => "username" } + ) + end + + def test_show + blocked_user = create(:user) + unblocked_user = create(:user) + normal_user = create(:user) + active_block = create(:user_block, :user => blocked_user) + revoked_block = create(:user_block, :revoked, :user => blocked_user) + expired_block = create(:user_block, :expired, :user => unblocked_user) + + # Asking for a list of blocks with a bogus user name should fail + get user_received_blocks_path("non_existent_user") + assert_response :not_found + assert_template "users/no_such_user" + assert_select "h1", "The user non_existent_user does not exist" + + # Check the list of blocks for a user that has never been blocked + get user_received_blocks_path(normal_user) + assert_response :success + assert_select "table#block_list", false + assert_select "p", "#{normal_user.display_name} has not been blocked yet." + + # Check the list of blocks for a user that is currently blocked + get user_received_blocks_path(blocked_user) + assert_response :success + assert_select "h1 a[href='#{user_path blocked_user}']", :text => blocked_user.display_name + assert_select "a.active[href='#{user_received_blocks_path blocked_user}']" + assert_select "table#block_list tbody", :count => 1 do + assert_select "tr", 2 + assert_select "a[href='#{user_block_path(active_block)}']", 1 + assert_select "a[href='#{user_block_path(revoked_block)}']", 1 + end + + # Check the list of blocks for a user that has previously been blocked + get user_received_blocks_path(unblocked_user) + assert_response :success + assert_select "h1 a[href='#{user_path unblocked_user}']", :text => unblocked_user.display_name + assert_select "a.active[href='#{user_received_blocks_path unblocked_user}']" + assert_select "table#block_list tbody", :count => 1 do + assert_select "tr", 1 + assert_select "a[href='#{user_block_path(expired_block)}']", 1 + end + end + + def test_show_paged + user = create(:user) + user_blocks = create_list(:user_block, 50, :user => user).reverse + next_path = user_received_blocks_path(user) + + get next_path + assert_response :success + check_user_blocks_table user_blocks[0...20] + check_no_page_link "Newer Blocks" + next_path = check_page_link "Older Blocks" + + get next_path + assert_response :success + check_user_blocks_table user_blocks[20...40] + check_page_link "Newer Blocks" + next_path = check_page_link "Older Blocks" + + get next_path + assert_response :success + check_user_blocks_table user_blocks[40...50] + check_page_link "Newer Blocks" + check_no_page_link "Older Blocks" + end + + def test_show_invalid_paged + user = create(:user) + + %w[-1 0 fred].each do |id| + get user_received_blocks_path(user, :before => id) + assert_redirected_to :controller => "/errors", :action => :bad_request + + get user_received_blocks_path(user, :after => id) + assert_redirected_to :controller => "/errors", :action => :bad_request + end + end + end +end From df1c59280f423004b8ade2f7d2a01994ce791b94 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Tue, 24 Dec 2024 07:50:29 +0300 Subject: [PATCH 6/6] Add revoke all actions to received blocks resource --- app/abilities/ability.rb | 2 +- app/controllers/user_blocks_controller.rb | 14 +-- .../users/received_blocks_controller.rb | 17 ++++ .../received_blocks/edit.html.erb} | 2 +- app/views/users/show.html.erb | 4 +- config/locales/en.yml | 21 ++--- config/routes.rb | 3 +- .../user_blocks_controller_test.rb | 86 ------------------- .../users/received_blocks_controller_test.rb | 84 ++++++++++++++++++ test/system/user_blocks_test.rb | 2 +- 10 files changed, 120 insertions(+), 115 deletions(-) rename app/views/{user_blocks/revoke_all.html.erb => users/received_blocks/edit.html.erb} (88%) diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb index fe899d09dd..6638016d72 100644 --- a/app/abilities/ability.rb +++ b/app/abilities/ability.rb @@ -56,7 +56,7 @@ def initialize(user) can [:read, :resolve, :ignore, :reopen], Issue can :create, IssueComment can [:create, :update, :destroy], Redaction - can [:create, :revoke_all], UserBlock + can [:create, :destroy], UserBlock can :update, UserBlock, :creator => user can :update, UserBlock, :revoker => user can :update, UserBlock, :active? => true diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb index 81b0cbcbac..a526f529e9 100644 --- a/app/controllers/user_blocks_controller.rb +++ b/app/controllers/user_blocks_controller.rb @@ -9,11 +9,11 @@ class UserBlocksController < ApplicationController authorize_resource - before_action :lookup_user, :only => [:new, :create, :revoke_all] + before_action :lookup_user, :only => [:new, :create] before_action :lookup_user_block, :only => [:show, :edit, :update] before_action :require_valid_params, :only => [:create, :update] before_action :check_database_readable - before_action :check_database_writable, :only => [:create, :update, :revoke_all] + before_action :check_database_writable, :only => [:create, :update] def index @params = params.permit @@ -105,16 +105,6 @@ def update end end - ## - # revokes all active blocks - def revoke_all - if request.post? && params[:confirm] - @user.blocks.active.each { |block| block.revoke!(current_user) } - flash[:notice] = t ".flash" - redirect_to user_received_blocks_path(@user) - end - end - private ## diff --git a/app/controllers/users/received_blocks_controller.rb b/app/controllers/users/received_blocks_controller.rb index a47b56a58c..6f6cabd26e 100644 --- a/app/controllers/users/received_blocks_controller.rb +++ b/app/controllers/users/received_blocks_controller.rb @@ -12,6 +12,7 @@ class ReceivedBlocksController < ApplicationController before_action :lookup_user before_action :check_database_readable + before_action :check_database_writable, :only => :destroy ## # shows a list of all the blocks on the given user @@ -27,5 +28,21 @@ def show render :partial => "user_blocks/page" if turbo_frame_request_id == "pagination" end + + ## + # shows revoke all active blocks page + def edit; end + + ## + # revokes all active blocks + def destroy + if params[:confirm] + @user.blocks.active.each { |block| block.revoke!(current_user) } + flash[:notice] = t ".flash" + redirect_to user_received_blocks_path(@user) + else + render :action => :edit + end + end end end diff --git a/app/views/user_blocks/revoke_all.html.erb b/app/views/users/received_blocks/edit.html.erb similarity index 88% rename from app/views/user_blocks/revoke_all.html.erb rename to app/views/users/received_blocks/edit.html.erb index f9a17d3e62..ff1a38be55 100644 --- a/app/views/user_blocks/revoke_all.html.erb +++ b/app/views/users/received_blocks/edit.html.erb @@ -6,7 +6,7 @@ <% unless @user.blocks.active.empty? %> - <%= bootstrap_form_for :revoke_all, :url => { :action => "revoke_all" } do |f| %> + <%= bootstrap_form_for :revoke_all, :url => { :action => :destroy }, :method => :delete do |f| %>
    <%= check_box_tag "confirm", "yes", false, { :class => "form-check-input" } %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 8b09c751e4..c168972aac 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -105,9 +105,9 @@ <% end %> - <% if can?(:revoke_all, UserBlock) and @user.blocks.active.exists? %> + <% if can?(:destroy, UserBlock) and @user.blocks.active.exists? %>
  • - <%= link_to t(".revoke_all_blocks"), revoke_all_user_blocks_path(@user) %> + <%= link_to t(".revoke_all_blocks"), edit_user_received_blocks_path(@user) %>
  • <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index e4489ff600..6504f58561 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2856,6 +2856,17 @@ en: title: "Blocks on %{name}" heading_html: "List of Blocks on %{name}" empty: "%{name} has not been blocked yet." + edit: + title: "Revoking all blocks on %{block_on}" + heading_html: "Revoking all blocks on %{block_on}" + empty: "%{name} has no active blocks." + confirm: "Are you sure you wish to revoke %{active_blocks}?" + active_blocks: + one: "%{count} active block" + other: "%{count} active blocks" + revoke: "Revoke!" + destroy: + flash: "All active blocks have been revoked." lists: show: title: Users @@ -2932,16 +2943,6 @@ en: title: "User blocks" heading: "List of user blocks" empty: "No blocks have been made yet." - revoke_all: - title: "Revoking all blocks on %{block_on}" - heading_html: "Revoking all blocks on %{block_on}" - empty: "%{name} has no active blocks." - confirm: "Are you sure you wish to revoke %{active_blocks}?" - active_blocks: - one: "%{count} active block" - other: "%{count} active blocks" - revoke: "Revoke!" - flash: "All active blocks have been revoked." helper: time_future_html: "Ends in %{time}." until_login: "Active until the user logs in." diff --git a/config/routes.rb b/config/routes.rb index 806e4ba855..e6a1aacda8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -273,7 +273,7 @@ resource :role, :controller => "user_roles", :path => "roles/:role", :only => [:create, :destroy] scope :module => :users do resource :issued_blocks, :path => "blocks_by", :only => :show - resource :received_blocks, :path => "blocks", :only => :show + resource :received_blocks, :path => "blocks", :only => [:show, :edit, :destroy] end end get "/user/:display_name/account", :to => redirect(:path => "/account/edit") @@ -335,7 +335,6 @@ # banning pages resources :user_blocks, :path_names => { :new => "new/:display_name" } - match "/user/:display_name/blocks/revoke_all" => "user_blocks#revoke_all", :via => [:get, :post], :as => "revoke_all_user_blocks" # issues and reports resources :issues do diff --git a/test/controllers/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb index 0b9c82f6a2..ddb33e9035 100644 --- a/test/controllers/user_blocks_controller_test.rb +++ b/test/controllers/user_blocks_controller_test.rb @@ -36,15 +36,6 @@ def test_routes { :path => "/user_blocks/1", :method => :delete }, { :controller => "user_blocks", :action => "destroy", :id => "1" } ) - - assert_routing( - { :path => "/user/username/blocks/revoke_all", :method => :get }, - { :controller => "user_blocks", :action => "revoke_all", :display_name => "username" } - ) - assert_routing( - { :path => "/user/username/blocks/revoke_all", :method => :post }, - { :controller => "user_blocks", :action => "revoke_all", :display_name => "username" } - ) end ## @@ -598,83 +589,6 @@ def test_revoke_using_update_by_other_moderator assert_equal other_moderator_user, block.revoker end - ## - # test the revoke all page - def test_revoke_all_page - blocked_user = create(:user) - create(:user_block, :user => blocked_user) - - # Asking for the revoke all blocks page with a bogus user name should fail - get user_received_blocks_path("non_existent_user") - assert_response :not_found - - # Check that the revoke all blocks page requires us to login - get revoke_all_user_blocks_path(blocked_user) - assert_redirected_to login_path(:referer => revoke_all_user_blocks_path(blocked_user)) - - # Login as a normal user - session_for(create(:user)) - - # Check that normal users can't load the revoke all blocks page - get revoke_all_user_blocks_path(blocked_user) - assert_redirected_to :controller => "errors", :action => "forbidden" - - # Login as a moderator - session_for(create(:moderator_user)) - - # Check that the revoke all blocks page loads for moderators - get revoke_all_user_blocks_path(blocked_user) - assert_response :success - assert_select "h1 a[href='#{user_path blocked_user}']", :text => blocked_user.display_name - end - - ## - # test the revoke all action - def test_revoke_all_action - blocked_user = create(:user) - active_block1 = create(:user_block, :user => blocked_user) - active_block2 = create(:user_block, :user => blocked_user) - expired_block1 = create(:user_block, :expired, :user => blocked_user) - blocks = [active_block1, active_block2, expired_block1] - moderator_user = create(:moderator_user) - - assert_predicate active_block1, :active? - assert_predicate active_block2, :active? - assert_not_predicate expired_block1, :active? - - # Login as a normal user - session_for(create(:user)) - - # Check that normal users can't load the block revoke page - get revoke_all_user_blocks_path(:blocked_user) - assert_redirected_to :controller => "errors", :action => "forbidden" - - # Login as a moderator - session_for(moderator_user) - - # Check that revoking blocks using GET should fail - get revoke_all_user_blocks_path(blocked_user, :confirm => true) - assert_response :success - assert_template "revoke_all" - - blocks.each(&:reload) - assert_predicate active_block1, :active? - assert_predicate active_block2, :active? - assert_not_predicate expired_block1, :active? - - # Check that revoking blocks works using POST - post revoke_all_user_blocks_path(blocked_user, :confirm => true) - assert_redirected_to user_received_blocks_path(blocked_user) - - blocks.each(&:reload) - assert_not_predicate active_block1, :active? - assert_not_predicate active_block2, :active? - assert_not_predicate expired_block1, :active? - assert_equal moderator_user, active_block1.revoker - assert_equal moderator_user, active_block2.revoker - assert_not_equal moderator_user, expired_block1.revoker - end - ## # test changes to end/deactivation dates def test_dates_when_viewed_before_end diff --git a/test/controllers/users/received_blocks_controller_test.rb b/test/controllers/users/received_blocks_controller_test.rb index b254f9ec30..a48a7e2cd5 100644 --- a/test/controllers/users/received_blocks_controller_test.rb +++ b/test/controllers/users/received_blocks_controller_test.rb @@ -12,6 +12,14 @@ def test_routes { :path => "/user/username/blocks", :method => :get }, { :controller => "users/received_blocks", :action => "show", :user_display_name => "username" } ) + assert_routing( + { :path => "/user/username/blocks/edit", :method => :get }, + { :controller => "users/received_blocks", :action => "edit", :user_display_name => "username" } + ) + assert_routing( + { :path => "/user/username/blocks", :method => :delete }, + { :controller => "users/received_blocks", :action => "destroy", :user_display_name => "username" } + ) end def test_show @@ -91,5 +99,81 @@ def test_show_invalid_paged assert_redirected_to :controller => "/errors", :action => :bad_request end end + + ## + # test the revoke all blocks page + def test_edit + blocked_user = create(:user) + create(:user_block, :user => blocked_user) + + # Asking for the revoke all blocks page with a bogus user name should fail + get user_received_blocks_path("non_existent_user") + assert_response :not_found + + # Check that the revoke all blocks page requires us to login + get edit_user_received_blocks_path(blocked_user) + assert_redirected_to login_path(:referer => edit_user_received_blocks_path(blocked_user)) + + # Login as a normal user + session_for(create(:user)) + + # Check that normal users can't load the revoke all blocks page + get edit_user_received_blocks_path(blocked_user) + assert_redirected_to :controller => "/errors", :action => "forbidden" + + # Login as a moderator + session_for(create(:moderator_user)) + + # Check that the revoke all blocks page loads for moderators + get edit_user_received_blocks_path(blocked_user) + assert_response :success + assert_select "h1 a[href='#{user_path blocked_user}']", :text => blocked_user.display_name + end + + ## + # test the revoke all action + def test_destroy + blocked_user = create(:user) + active_block1 = create(:user_block, :user => blocked_user) + active_block2 = create(:user_block, :user => blocked_user) + expired_block1 = create(:user_block, :expired, :user => blocked_user) + blocks = [active_block1, active_block2, expired_block1] + moderator_user = create(:moderator_user) + + assert_predicate active_block1, :active? + assert_predicate active_block2, :active? + assert_not_predicate expired_block1, :active? + + # Check that normal users can't revoke all blocks + session_for(create(:user)) + delete user_received_blocks_path(blocked_user, :confirm => true) + assert_redirected_to :controller => "/errors", :action => "forbidden" + + blocks.each(&:reload) + assert_predicate active_block1, :active? + assert_predicate active_block2, :active? + assert_not_predicate expired_block1, :active? + + # Check that confirmation is required + session_for(moderator_user) + delete user_received_blocks_path(blocked_user) + + blocks.each(&:reload) + assert_predicate active_block1, :active? + assert_predicate active_block2, :active? + assert_not_predicate expired_block1, :active? + + # Check that moderators can revoke all blocks + delete user_received_blocks_path(blocked_user, :confirm => true) + assert_redirected_to user_received_blocks_path(blocked_user) + + blocks.each(&:reload) + assert_not_predicate active_block1, :active? + assert_not_predicate active_block2, :active? + assert_not_predicate expired_block1, :active? + assert_equal moderator_user, active_block1.revoker + assert_equal moderator_user, active_block2.revoker + assert_not_equal moderator_user, expired_block1.revoker + end end end diff --git a/test/system/user_blocks_test.rb b/test/system/user_blocks_test.rb index e9fa4e7ec4..52fe3bc3dc 100644 --- a/test/system/user_blocks_test.rb +++ b/test/system/user_blocks_test.rb @@ -31,7 +31,7 @@ class UserBlocksSystemTest < ApplicationSystemTestCase blocked_user = create(:user) sign_in_as(create(:moderator_user)) - visit revoke_all_user_blocks_path(blocked_user) + visit edit_user_received_blocks_path(blocked_user) assert_title "Revoking all blocks on #{blocked_user.display_name}" assert_text "Revoking all blocks on #{blocked_user.display_name}" assert_no_button "Revoke!"