diff --git a/app/controllers/management/proposals_controller.rb b/app/controllers/management/proposals_controller.rb index 340a6481c..783f81216 100644 --- a/app/controllers/management/proposals_controller.rb +++ b/app/controllers/management/proposals_controller.rb @@ -14,7 +14,7 @@ class Management::ProposalsController < Management::BaseController end def print - @proposals = Proposal.all.page(params[:page]).for_render.send("sort_by_#{@current_order}") + @proposals = Proposal.send("sort_by_#{@current_order}").limit(5) set_proposal_votes(@proposal) end diff --git a/app/views/management/proposals/print.html.erb b/app/views/management/proposals/print.html.erb index ddd36be14..2501bca5f 100644 --- a/app/views/management/proposals/print.html.erb +++ b/app/views/management/proposals/print.html.erb @@ -13,7 +13,6 @@ <%= render @proposals %> - <%= paginate @proposals %> diff --git a/spec/features/management/proposals_spec.rb b/spec/features/management/proposals_spec.rb index d3339020f..46411c7af 100644 --- a/spec/features/management/proposals_spec.rb +++ b/spec/features/management/proposals_spec.rb @@ -104,16 +104,12 @@ feature 'Proposals' do context "Printing" do scenario 'Printing proposals', :js do - 5.times { create(:proposal) } + 6.times { create(:proposal) } click_link "Print proposals" - find("#print_link").click - - ### CHANGE ME - # should probably test something else here - # maybe that we are loading a print.css stylesheet? - ### + expect(page).to have_css('.proposal', count: 5) + expect(page).to have_css("a[href='javascript:window.print();']", text: 'Print') end scenario "Filtering proposals to be printed", :js do