Merge pull request #656 from AyuntamientoMadrid/no-featured-on-tags

hides featured proposal from tag page

app/controllers/proposals_controller.rb

@@ -12,7 +12,7 @@ class ProposalsController < ApplicationController
   respond_to :html, :js
 
   def index_customization
-    @featured_proposals = Proposal.all.sort_by_confidence_score.limit(3) if @search_terms.blank?
+    @featured_proposals = Proposal.all.sort_by_confidence_score.limit(3) if (@search_terms.blank? && @tag_filter.blank?)
     if @featured_proposals.present?
       set_featured_proposal_votes(@featured_proposals)
       @resources = @resources.where('proposals.id NOT IN (?)', @featured_proposals.map(&:id))

spec/features/proposals_spec.rb

@@ -559,7 +559,7 @@ feature 'Proposals' do
     end
   end
 
-  scenario 'proposal index search' do
+  scenario 'Proposal index search' do
     proposal1 = create(:proposal, title: "Show me what you got")
     proposal2 = create(:proposal, title: "Get Schwifty")
     proposal3 = create(:proposal)
@@ -584,6 +584,28 @@ feature 'Proposals' do
     end
   end
 
+  scenario 'Index search does not show featured proposals' do
+    featured_proposals = create_featured_proposals
+    proposal = create(:proposal, title: "Abcdefghi")
+
+    visit proposals_path
+    fill_in "search", with: proposal.title
+    click_button "Search"
+
+    expect(page).to_not have_selector('#proposals .proposal-featured')
+    expect(page).to_not have_selector('#featured-proposals')
+  end
+
+  scenario 'Tag index tag does not show featured proposals' do
+    featured_proposals = create_featured_proposals
+    proposal = create(:proposal, tag_list: "123")
+
+    visit proposals_path(tag: "123")
+
+    expect(page).to_not have_selector('#proposals .proposal-featured')
+    expect(page).to_not have_selector('#featured-proposals')
+  end
+
   scenario 'Conflictive' do
     good_proposal = create(:proposal)
     conflictive_proposal = create(:proposal, :conflictive)