From d4ec75042864cde2742e4f7130503d59c795c418 Mon Sep 17 00:00:00 2001 From: Julian Herrero Date: Wed, 29 May 2019 16:30:15 +0200 Subject: [PATCH] Show archived proposals in selected proposals list --- app/controllers/proposals_controller.rb | 4 +++- spec/features/proposals_spec.rb | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index a7d171d9a..fc596c5f0 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -129,7 +129,9 @@ class ProposalsController < ApplicationController end def discard_archived - @resources = @resources.not_archived unless @current_order == "archival_date" + unless @current_order == "archival_date" || params[:selected].present? + @resources = @resources.not_archived + end end def load_retired diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 698a43961..5e4667b22 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -1013,6 +1013,16 @@ feature "Proposals" do expect(page).not_to have_link "highest rated" expect(page).not_to have_link "newest" end + + scenario "show archived proposals in selected proposals list" do + archived_proposal = create(:proposal, :selected, :archived) + + visit proposals_path + expect(page).not_to have_content archived_proposal.title + + click_link "Selected proposals" + expect(page).to have_content archived_proposal.title + end end context "Search" do