From 8acd119b192469432315505bf220068b0c281737 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 20 Oct 2015 14:45:59 +0200 Subject: [PATCH 1/2] displays only the first 5 proposals to print --- app/controllers/management/proposals_controller.rb | 2 +- app/views/management/proposals/print.html.erb | 1 - spec/features/management/proposals_spec.rb | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) 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..8cf432bb2 100644 --- a/spec/features/management/proposals_spec.rb +++ b/spec/features/management/proposals_spec.rb @@ -104,10 +104,11 @@ feature 'Proposals' do context "Printing" do scenario 'Printing proposals', :js do - 5.times { create(:proposal) } + 6.times { create(:proposal) } click_link "Print proposals" + expect(page).to have_css('.proposal', count: 5) find("#print_link").click ### CHANGE ME From 786986053b3d6465bb3aa38f7cf8ee7f3255c249 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Tue, 20 Oct 2015 14:50:26 +0200 Subject: [PATCH 2/2] tests print button present --- spec/features/management/proposals_spec.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/spec/features/management/proposals_spec.rb b/spec/features/management/proposals_spec.rb index 8cf432bb2..46411c7af 100644 --- a/spec/features/management/proposals_spec.rb +++ b/spec/features/management/proposals_spec.rb @@ -109,12 +109,7 @@ feature 'Proposals' do click_link "Print proposals" expect(page).to have_css('.proposal', count: 5) - 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("a[href='javascript:window.print();']", text: 'Print') end scenario "Filtering proposals to be printed", :js do