diff --git a/app/helpers/proposals_helper.rb b/app/helpers/proposals_helper.rb index 9abbb198c..ecd8a1490 100644 --- a/app/helpers/proposals_helper.rb +++ b/app/helpers/proposals_helper.rb @@ -106,4 +106,8 @@ module ProposalsHelper def show_featured_proposals? params[:selected].blank? && @featured_proposals.present? end + + def show_recommended_proposals? + params[:selected].blank? && feature?("user.recommendations") && @recommended_proposals.present? + end end diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb index 33be571fd..90e06d272 100644 --- a/app/views/proposals/index.html.erb +++ b/app/views/proposals/index.html.erb @@ -45,7 +45,7 @@ <%= render "shared/section_header", i18n_namespace: "proposals.index.section_header", image: "proposals" %> <% end %> - <% if feature?("user.recommendations") && @recommended_proposals.present? %> + <% if show_recommended_proposals? %> <%= render "shared/recommended_index", recommended: @recommended_proposals, disable_recommendations_path: recommendations_disable_proposals_path, namespace: "proposals" %> diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 98e825dfe..937877957 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -977,6 +977,26 @@ feature "Proposals" do expect(page).not_to have_selector("#proposals .proposal-featured") expect(page).not_to have_selector("#featured-proposals") end + + scenario "do not show recommented proposal in selected proposals list" do + create(:proposal, title: "Recommended", cached_votes_up: 10, tag_list: "Economy") + + user = create(:user) + create(:follow, followable: create(:proposal, tag_list: "Economy"), user: user) + + login_as(user) + visit proposals_path + + expect(page).to have_css(".recommendation", count: 1) + expect(page).to have_link "Recommended" + expect(page).to have_link "See more recommendations" + + click_link "Selected proposals" + + expect(page).not_to have_css ".recommendation" + expect(page).not_to have_link "Recommended" + expect(page).not_to have_link "See more recommendations" + end end context "Search" do