Merge pull request #3314 from consul/backport-without_valuator

Consider having valuator group as having valuator
consuldemocracy · Feb 19, 2019 · 7c61f62 · 7c61f62
2 parents 44483c2 + bd67fcb
commit 7c61f62
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb
@@ -63,7 +63,8 @@ class Investment < ActiveRecord::Base
 
     scope :valuation_open,              -> { where(valuation_finished: false) }
     scope :without_admin,               -> { valuation_open.where(administrator_id: nil) }
-    scope :without_valuator,            -> { valuation_open.where(valuator_assignments_count: 0) }
+    scope :without_valuator_group,      -> { where(valuator_group_assignments_count: 0) }
+    scope :without_valuator,            -> { valuation_open.without_valuator_group.where(valuator_assignments_count: 0) }
     scope :under_valuation,             -> { valuation_open.valuating.where("administrator_id IS NOT ?", nil) }
     scope :managed,                     -> { valuation_open.where(valuator_assignments_count: 0).where("administrator_id IS NOT ?", nil) }
     scope :valuating,                   -> { valuation_open.where("valuator_assignments_count > 0 OR valuator_group_assignments_count > 0" ) }

diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/features/admin/budget_investments_spec.rb
@@ -270,19 +270,30 @@
     end
 
     scenario "Filtering by assignment status" do
-      assigned = create(:budget_investment, title: "Assigned idea", budget: budget, administrator: create(:administrator))
-      valuating = create(:budget_investment, title: "Evaluating...", budget: budget)
-      valuating.valuators.push(create(:valuator))
+      create(:budget_investment, title: "Assigned idea", budget: budget,
+             administrator: create(:administrator))
+      create(:budget_investment, title: "Evaluating...", budget: budget,
+             valuators: [create(:valuator)])
+      create(:budget_investment, title: "With group", budget: budget,
+             valuator_groups: [create(:valuator_group)])
+
+      visit admin_budget_budget_investments_path(budget_id: budget.id, filter: "valuation_open")
+
+      expect(page).to have_content("Assigned idea")
+      expect(page).to have_content("Evaluating...")
+      expect(page).to have_content("With group")
 
       visit admin_budget_budget_investments_path(budget_id: budget.id, filter: 'without_admin')
 
       expect(page).to have_content("Evaluating...")
+      expect(page).to have_content("With group")
       expect(page).not_to have_content("Assigned idea")
 
       visit admin_budget_budget_investments_path(budget_id: budget.id, filter: 'without_valuator')
 
       expect(page).to have_content("Assigned idea")
       expect(page).not_to have_content("Evaluating...")
+      expect(page).not_to have_content("With group")
     end
 
     scenario "Filtering by valuation status" do