Fix conflics after rebase

spec/features/valuation/budget_investments_spec.rb

@@ -26,8 +26,8 @@ feature 'Valuation budget investments' do
   end
 
   scenario 'Index shows budget investments assigned to current valuator' do
-    investment1 = create(:budget_investment, budget: budget)
-    investment2 = create(:budget_investment, budget: budget)
+    investment1 = create(:budget_investment, :visible_to_valuators, budget: budget)
+    investment2 = create(:budget_investment, :visible_to_valuators, budget: budget)
 
     investment1.valuators << valuator
 
@@ -38,8 +38,8 @@ feature 'Valuation budget investments' do
   end
 
   scenario 'Index shows no budget investment to admins no valuators' do
-    investment1 = create(:budget_investment, budget: budget)
-    investment2 = create(:budget_investment, budget: budget)
+    investment1 = create(:budget_investment, :visible_to_valuators, budget: budget)
+    investment2 = create(:budget_investment, :visible_to_valuators, budget: budget)
 
     investment1.valuators << valuator
 
@@ -52,9 +52,9 @@ feature 'Valuation budget investments' do
   end
 
   scenario 'Index orders budget investments by votes' do
-    investment10  = create(:budget_investment, budget: budget, cached_votes_up: 10)
-    investment100 = create(:budget_investment, budget: budget, cached_votes_up: 100)
-    investment1   = create(:budget_investment, budget: budget, cached_votes_up: 1)
+    investment10  = create(:budget_investment, :visible_to_valuators, budget: budget, cached_votes_up: 10)
+    investment100 = create(:budget_investment, :visible_to_valuators, budget: budget, cached_votes_up: 100)
+    investment1   = create(:budget_investment, :visible_to_valuators, budget: budget, cached_votes_up: 1)
 
     investment1.valuators << valuator
     investment10.valuators << valuator
@@ -66,6 +66,27 @@ feature 'Valuation budget investments' do
     expect(investment10.title).to appear_before(investment1.title)
   end
 
+  scenario 'Index displays investments paginated' do
+    per_page = Kaminari.config.default_per_page
+    (per_page + 2).times do
+      investment = create(:budget_investment, :visible_to_valuators, budget: @budget)
+      investment.valuators << @valuator
+    end
+
+    visit valuation_budget_budget_investments_path(@budget)
+
+    expect(page).to have_css('.budget_investment', count: per_page)
+
+    within("ul.pagination") do
+      expect(page).to have_content("1")
+      expect(page).to have_content("2")
+      expect(page).not_to have_content("3")
+      click_link "Next", exact: false
+    end
+
+    expect(page).to have_css('.budget_investment', count: 2)
+  end
+
   scenario "Index filtering by heading", :js do
     group = create(:budget_group, budget: budget)
     valuating_heading = create(:budget_heading, name: "Only Valuating", group: group)
@@ -91,6 +112,14 @@ feature 'Valuation budget investments' do
                                           group: group,
                                           budget: budget,
                                           valuators: [valuator])
+    # heading1 = create(:budget_heading, name: "District 9", group: group)
+    # heading2 = create(:budget_heading, name: "Down to the river", group: group)
+    # investment1 = create(:budget_investment, :visible_to_valuators, title: "Realocate visitors",
+    #                                           heading: heading1, group: group, budget: budget)
+    # investment2 = create(:budget_investment, :visible_to_valuators, title: "Destroy the city",
+    #                                           heading: heading2, group: group, budget: budget)
+    investment1.valuators << valuator
+    investment2.valuators << valuator
 
     visit valuation_budget_budget_investments_path(budget)
 
@@ -162,9 +191,10 @@ feature 'Valuation budget investments' do
   end
 
   scenario "Index filtering by valuation status" do
-    valuating = create(:budget_investment, budget: budget, title: "Ongoing valuation")
-    valuated  = create(:budget_investment, budget: budget, title: "Old idea",
-                                           valuation_finished: true)
+    valuating = create(:budget_investment, :visible_to_valuators,
+                                            budget: budget, title: "Ongoing valuation")
+    valuated  = create(:budget_investment, :visible_to_valuators,
+                                            budget: budget, title: "Old idea", valuation_finished: true)
     valuating.valuators << valuator
     valuated.valuators << valuator
 
@@ -194,7 +224,7 @@ feature 'Valuation budget investments' do
     let(:investment) do
       create(:budget_investment, budget: budget, price: 1234, feasibility: 'unfeasible',
                                  unfeasibility_explanation: 'It is impossible',
-                                 administrator: administrator)
+                                 administrator: administrator,)
     end
 
     background do
@@ -202,8 +232,10 @@ feature 'Valuation budget investments' do
     end
 
     scenario 'visible for assigned valuators' do
+      investment.update(visible_to_valuators: true)
       visit valuation_budget_budget_investments_path(budget)
 
+
       click_link investment.title
 
       expect(page).to have_content(investment.title)