diff --git a/app/controllers/concerns/moderate_actions.rb b/app/controllers/concerns/moderate_actions.rb index 17bb1e360..d6c35e777 100644 --- a/app/controllers/concerns/moderate_actions.rb +++ b/app/controllers/concerns/moderate_actions.rb @@ -1,12 +1,13 @@ module ModerateActions extend ActiveSupport::Concern include Polymorphic + PER_PAGE = 50 def index @resources = @resources.send(@current_filter) .send("sort_by_#{@current_order}") .page(params[:page]) - .per(50) + .per(PER_PAGE) set_resources_instance end diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/features/admin/budget_investments_spec.rb index 5cd9a4139..d500719e0 100644 --- a/spec/features/admin/budget_investments_spec.rb +++ b/spec/features/admin/budget_investments_spec.rb @@ -1543,7 +1543,7 @@ describe "Admin budget investments" do before { selected_bi.update(cached_votes_up: 50) } scenario "After unselecting an investment", :js do - create_list(:budget_investment, 30, budget: budget) + allow(Budget::Investment).to receive(:default_per_page).and_return(3) visit admin_budget_budget_investments_path(budget) diff --git a/spec/features/admin/hidden_budget_investments_spec.rb b/spec/features/admin/hidden_budget_investments_spec.rb index 678b35ecf..f03a517bd 100644 --- a/spec/features/admin/hidden_budget_investments_spec.rb +++ b/spec/features/admin/hidden_budget_investments_spec.rb @@ -90,8 +90,8 @@ describe "Admin hidden budget investments" do end scenario "Action links remember the pagination setting and the filter" do - per_page = Kaminari.config.default_per_page - (per_page + 2).times { create(:budget_investment, :hidden, :with_confirmed_hide, heading: heading) } + allow(Budget::Investment).to receive(:default_per_page).and_return(2) + 4.times { create(:budget_investment, :hidden, :with_confirmed_hide, heading: heading) } visit admin_hidden_budget_investments_path(filter: "with_confirmed_hide", page: 2) diff --git a/spec/features/admin/hidden_comments_spec.rb b/spec/features/admin/hidden_comments_spec.rb index 5c83a3e7f..92d28df1f 100644 --- a/spec/features/admin/hidden_comments_spec.rb +++ b/spec/features/admin/hidden_comments_spec.rb @@ -125,8 +125,8 @@ describe "Admin hidden comments" do end scenario "Action links remember the pagination setting and the filter" do - per_page = Kaminari.config.default_per_page - (per_page + 2).times { create(:comment, :hidden, :with_confirmed_hide) } + allow(Comment).to receive(:default_per_page).and_return(2) + 4.times { create(:comment, :hidden, :with_confirmed_hide) } visit admin_hidden_comments_path(filter: "with_confirmed_hide", page: 2) diff --git a/spec/features/admin/hidden_debates_spec.rb b/spec/features/admin/hidden_debates_spec.rb index 7bfc45a59..3b4e55134 100644 --- a/spec/features/admin/hidden_debates_spec.rb +++ b/spec/features/admin/hidden_debates_spec.rb @@ -77,8 +77,8 @@ describe "Admin hidden debates" do end scenario "Action links remember the pagination setting and the filter" do - per_page = Kaminari.config.default_per_page - (per_page + 2).times { create(:debate, :hidden, :with_confirmed_hide) } + allow(Debate).to receive(:default_per_page).and_return(2) + 4.times { create(:debate, :hidden, :with_confirmed_hide) } visit admin_hidden_debates_path(filter: "with_confirmed_hide", page: 2) diff --git a/spec/features/admin/hidden_proposals_spec.rb b/spec/features/admin/hidden_proposals_spec.rb index 366bbcbaa..cbc25c52b 100644 --- a/spec/features/admin/hidden_proposals_spec.rb +++ b/spec/features/admin/hidden_proposals_spec.rb @@ -89,8 +89,8 @@ describe "Admin hidden proposals" do end scenario "Action links remember the pagination setting and the filter" do - per_page = Kaminari.config.default_per_page - (per_page + 2).times { create(:proposal, :hidden, :with_confirmed_hide) } + allow(Proposal).to receive(:default_per_page).and_return(2) + 4.times { create(:proposal, :hidden, :with_confirmed_hide) } visit admin_hidden_proposals_path(filter: "with_confirmed_hide", page: 2) diff --git a/spec/features/admin/hidden_users_spec.rb b/spec/features/admin/hidden_users_spec.rb index 349472a64..1a4480fb0 100644 --- a/spec/features/admin/hidden_users_spec.rb +++ b/spec/features/admin/hidden_users_spec.rb @@ -82,8 +82,8 @@ describe "Admin hidden users" do end scenario "Action links remember the pagination setting and the filter" do - per_page = Kaminari.config.default_per_page - (per_page + 2).times { create(:user, :hidden, :with_confirmed_hide) } + allow(User).to receive(:default_per_page).and_return(2) + 4.times { create(:user, :hidden, :with_confirmed_hide) } visit admin_hidden_users_path(filter: "with_confirmed_hide", page: 2) diff --git a/spec/features/admin/local_census_records_spec.rb b/spec/features/admin/local_census_records_spec.rb index 2ae2348c8..e326e2b92 100644 --- a/spec/features/admin/local_census_records_spec.rb +++ b/spec/features/admin/local_census_records_spec.rb @@ -40,7 +40,8 @@ describe "Admin local census records" do end scenario "Should show paginator" do - create_list(:local_census_record, 25) + allow(LocalCensusRecord).to receive(:default_per_page).and_return(3) + create_list(:local_census_record, 3) visit admin_local_census_records_path within ".pagination" do diff --git a/spec/features/admin/organizations_spec.rb b/spec/features/admin/organizations_spec.rb index 01364d9e2..86548e846 100644 --- a/spec/features/admin/organizations_spec.rb +++ b/spec/features/admin/organizations_spec.rb @@ -202,9 +202,9 @@ describe "Admin::Organizations" do expect(page).not_to have_content("Verified Organization") end - scenario "Verifying organization links remember the pagination setting and the filter" do - per_page = Kaminari.config.default_per_page - (per_page + 2).times { create(:organization) } + scenario "Verifying organization links remembers parameters " do + allow(Organization).to receive(:default_per_page).and_return(2) + 4.times { create(:organization) } visit admin_organizations_path(filter: "pending", page: 2) diff --git a/spec/features/admin/proposal_notifications_spec.rb b/spec/features/admin/proposal_notifications_spec.rb index 3d4cef4fd..92889b118 100644 --- a/spec/features/admin/proposal_notifications_spec.rb +++ b/spec/features/admin/proposal_notifications_spec.rb @@ -80,8 +80,8 @@ describe "Admin proposal notifications" do end scenario "Action links remember the pagination setting and the filter" do - per_page = Kaminari.config.default_per_page - (per_page + 2).times { create(:proposal_notification, :hidden, :with_confirmed_hide) } + allow(ProposalNotification).to receive(:default_per_page).and_return(2) + 4.times { create(:proposal_notification, :hidden, :with_confirmed_hide) } visit admin_proposal_notifications_path(filter: "with_confirmed_hide", page: 2) diff --git a/spec/features/admin/site_customization/documents_spec.rb b/spec/features/admin/site_customization/documents_spec.rb index 1b62b0a4d..1b0ac771b 100644 --- a/spec/features/admin/site_customization/documents_spec.rb +++ b/spec/features/admin/site_customization/documents_spec.rb @@ -37,8 +37,9 @@ describe "Documents" do end scenario "Index (pagination)" do - per_page = Kaminari.config.default_per_page - (per_page + 5).times { create(:document, :admin) } + per_page = 3 + allow(Document).to receive(:default_per_page).and_return(per_page) + (per_page + 2).times { create(:document, :admin) } visit admin_site_customization_documents_path @@ -51,7 +52,7 @@ describe "Documents" do click_link "Next", exact: false end - expect(page).to have_selector("#documents .document", count: 5) + expect(page).to have_selector("#documents .document", count: 2) end scenario "Create" do diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb index ed19b9a20..cf03f9ccf 100644 --- a/spec/features/debates_spec.rb +++ b/spec/features/debates_spec.rb @@ -35,7 +35,8 @@ describe "Debates" do end scenario "Paginated Index" do - per_page = Kaminari.config.default_per_page + per_page = 3 + allow(Debate).to receive(:default_per_page).and_return(per_page) (per_page + 2).times { create(:debate) } visit debates_path diff --git a/spec/features/moderation/budget_investments_spec.rb b/spec/features/moderation/budget_investments_spec.rb index 03b8606eb..06e0476d3 100644 --- a/spec/features/moderation/budget_investments_spec.rb +++ b/spec/features/moderation/budget_investments_spec.rb @@ -119,7 +119,8 @@ describe "Moderate budget investments" do end scenario "remembering page, filter and order" do - create_list(:budget_investment, 52, heading: heading, author: create(:user)) + stub_const("#{ModerateActions}::PER_PAGE", 2) + create_list(:budget_investment, 4, heading: heading, author: create(:user)) visit moderation_budget_investments_path(filter: "all", page: "2", order: "created_at") diff --git a/spec/features/moderation/comments_spec.rb b/spec/features/moderation/comments_spec.rb index 2508539c9..7856176aa 100644 --- a/spec/features/moderation/comments_spec.rb +++ b/spec/features/moderation/comments_spec.rb @@ -125,7 +125,8 @@ describe "Moderate comments" do end scenario "remembering page, filter and order" do - create_list(:comment, 52) + stub_const("#{ModerateActions}::PER_PAGE", 2) + create_list(:comment, 4) visit moderation_comments_path(filter: "all", page: "2", order: "newest") diff --git a/spec/features/moderation/debates_spec.rb b/spec/features/moderation/debates_spec.rb index e474ba760..03d66b4a4 100644 --- a/spec/features/moderation/debates_spec.rb +++ b/spec/features/moderation/debates_spec.rb @@ -106,7 +106,8 @@ describe "Moderate debates" do end scenario "remembering page, filter and order" do - create_list(:debate, 52) + stub_const("#{ModerateActions}::PER_PAGE", 2) + create_list(:debate, 4) visit moderation_debates_path(filter: "all", page: "2", order: "created_at") diff --git a/spec/features/moderation/proposal_notifications_spec.rb b/spec/features/moderation/proposal_notifications_spec.rb index cc0613bb5..3b10ab342 100644 --- a/spec/features/moderation/proposal_notifications_spec.rb +++ b/spec/features/moderation/proposal_notifications_spec.rb @@ -101,7 +101,8 @@ describe "Moderate proposal notifications" do end scenario "remembering page, filter and order" do - create_list(:proposal, 52) + stub_const("#{ModerateActions}::PER_PAGE", 2) + create_list(:proposal, 4) visit moderation_proposal_notifications_path(filter: "all", page: "2", order: "created_at") diff --git a/spec/features/moderation/proposals_spec.rb b/spec/features/moderation/proposals_spec.rb index 5f24d2b59..c66c6b296 100644 --- a/spec/features/moderation/proposals_spec.rb +++ b/spec/features/moderation/proposals_spec.rb @@ -105,7 +105,8 @@ describe "Moderate proposals" do end scenario "remembering page, filter and order" do - create_list(:proposal, 52) + stub_const("#{ModerateActions}::PER_PAGE", 2) + create_list(:proposal, 4) visit moderation_proposals_path(filter: "all", page: "2", order: "created_at") diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index e18c33302..2ea2757bd 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -91,7 +91,8 @@ describe "Proposals" do end scenario "Pagination" do - per_page = Kaminari.config.default_per_page + per_page = 3 + allow(Proposal).to receive(:default_per_page).and_return(per_page) (per_page + 2).times { create(:proposal) } visit proposals_path diff --git a/spec/features/valuation/budget_investments_spec.rb b/spec/features/valuation/budget_investments_spec.rb index ce4d014b1..6be48f661 100644 --- a/spec/features/valuation/budget_investments_spec.rb +++ b/spec/features/valuation/budget_investments_spec.rb @@ -85,7 +85,8 @@ describe "Valuation budget investments" do end scenario "Index displays investments paginated" do - per_page = Kaminari.config.default_per_page + per_page = 3 + allow(Budget::Investment).to receive(:default_per_page).and_return(per_page) (per_page + 2).times do create(:budget_investment, :visible_to_valuators, budget: budget, valuators: [valuator]) end