diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index dae693c24..7b3ccafe7 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -95,7 +95,7 @@ class ProposalsController < ApplicationController end def load_featured - @featured_proposals = Proposal.all.sort_by_confidence_score.limit(3) if (!@advanced_search_terms && @search_terms.blank? && @tag_filter.blank? && params[:retired].blank?) + @featured_proposals = Proposal.not_archived.sort_by_confidence_score.limit(3) if (!@advanced_search_terms && @search_terms.blank? && @tag_filter.blank? && params[:retired].blank?) if @featured_proposals.present? set_featured_proposal_votes(@featured_proposals) @resources = @resources.where('proposals.id NOT IN (?)', @featured_proposals.map(&:id)) diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 01cbc3fa4..9149531fd 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -738,6 +738,33 @@ feature 'Proposals' do expect(page).to have_content "This proposal has been archived and can't collect supports" end + scenario 'do not show in featured proposals section' do + featured_proposal = create(:proposal, :with_confidence_score, cached_votes_up: 100) + archived_proposal = create(:proposal, :archived, :with_confidence_score, cached_votes_up: 10000) + + visit proposals_path + + within("#featured-proposals") do + expect(page).to have_content(featured_proposal.title) + expect(page).to_not have_content(archived_proposal.title) + end + within("#proposals-list") do + expect(page).to_not have_content(featured_proposal.title) + expect(page).to_not have_content(archived_proposal.title) + end + + click_link "Archived" + + within("#featured-proposals") do + expect(page).to have_content(featured_proposal.title) + expect(page).to_not have_content(archived_proposal.title) + end + within("#proposals-list") do + expect(page).to_not have_content(featured_proposal.title) + expect(page).to have_content(archived_proposal.title) + end + end + end context "Search" do