Directly assign valuators in specs

Creating a record and then assigning an association makes the code even
harder to follow.

spec/models/abilities/valuator_spec.rb

@@ -8,17 +8,13 @@ describe Abilities::Valuator do
   let(:valuator) { create(:valuator) }
   let(:group) { create(:valuator_group) }
   let(:non_assigned_investment) { create(:budget_investment) }
-  let(:assigned_investment) { create(:budget_investment, budget: create(:budget, :valuating)) }
+  let(:assigned_investment) { create(:budget_investment, budget: create(:budget, :valuating), valuators: [valuator]) }
   let(:group_assigned_investment) { create(:budget_investment, budget: create(:budget, :valuating)) }
-  let(:finished_assigned_investment) { create(:budget_investment, budget: create(:budget, :finished)) }
+  let(:finished_assigned_investment) { create(:budget_investment, budget: create(:budget, :finished), valuators: [valuator]) }
 
   before do
-    assigned_investment.valuators << valuator
-
     group_assigned_investment.valuator_groups << group
     valuator.update(valuator_group: group)
-
-    finished_assigned_investment.valuators << valuator
   end
 
   it "cannot valuate an assigned investment with a finished valuation" do

spec/models/budget/investment_spec.rb

@@ -337,16 +337,12 @@ describe Budget::Investment do
 
   describe "by_valuator" do
     it "returns investments assigned to specific valuator" do
-      investment1 = create(:budget_investment)
-      investment2 = create(:budget_investment)
-      investment3 = create(:budget_investment)
-
       valuator1 = create(:valuator)
       valuator2 = create(:valuator)
 
-      investment1.valuators << valuator1
-      investment2.valuators << valuator2
-      investment3.valuators << [valuator1, valuator2]
+      investment1 = create(:budget_investment, valuators: [valuator1])
+      investment2 = create(:budget_investment, valuators: [valuator2])
+      investment3 = create(:budget_investment, valuators: [valuator1, valuator2])
 
       by_valuator = Budget::Investment.by_valuator(valuator1.id)
 
@@ -420,10 +416,9 @@ describe Budget::Investment do
 
     describe "managed" do
       it "returns all open investments with assigned admin but without assigned valuators" do
-        investment1 = create(:budget_investment, :with_administrator)
+        investment1 = create(:budget_investment, :with_administrator, valuators: [create(:valuator)])
         investment2 = create(:budget_investment, :with_administrator, :finished)
         investment3 = create(:budget_investment, :with_administrator)
-        investment1.valuators << create(:valuator)
 
         managed = Budget::Investment.managed
 
@@ -434,11 +429,8 @@ describe Budget::Investment do
     describe "valuating" do
       it "returns all investments with assigned valuator but valuation not finished" do
         investment1 = create(:budget_investment)
-        investment2 = create(:budget_investment)
-        investment3 = create(:budget_investment, :finished)
-
-        investment2.valuators << create(:valuator)
-        investment3.valuators << create(:valuator)
+        investment2 = create(:budget_investment, valuators: [create(:valuator)])
+        investment3 = create(:budget_investment, :finished, valuators: [create(:valuator)])
 
         valuating = Budget::Investment.valuating
 
@@ -462,11 +454,8 @@ describe Budget::Investment do
     describe "valuation_finished" do
       it "returns all investments with valuation finished" do
         investment1 = create(:budget_investment)
-        investment2 = create(:budget_investment)
-        investment3 = create(:budget_investment, :finished)
-
-        investment2.valuators << create(:valuator)
-        investment3.valuators << create(:valuator)
+        investment2 = create(:budget_investment, valuators: [create(:valuator)])
+        investment3 = create(:budget_investment, :finished, valuators: [create(:valuator)])
 
         valuation_finished = Budget::Investment.valuation_finished
 
@@ -1166,9 +1155,8 @@ describe Budget::Investment do
     describe "with under_valuation filter" do
       let(:params) { { advanced_filters: ["under_valuation"], budget_id: budget.id } }
       it "returns only investment under valuation" do
-        valuator1 = create(:valuator)
-        investment1 = create(:budget_investment, :with_administrator, :unfinished, budget: budget)
-        investment1.valuators << valuator1
+        investment1 = create(:budget_investment, :with_administrator, :unfinished,
+                             budget: budget, valuators: [create(:valuator)])
         create(:budget_investment, :with_administrator, budget: budget)
         create(:budget_investment, budget: budget)
 

spec/models/valuator_spec.rb

@@ -20,13 +20,10 @@ describe Valuator do
 
     it "returns investments assigned to a valuator" do
       valuator = create(:valuator)
-      investment1 = create(:budget_investment)
-      investment2 = create(:budget_investment)
+      investment1 = create(:budget_investment, valuators: [valuator])
+      investment2 = create(:budget_investment, valuators: [valuator])
       investment3 = create(:budget_investment)
 
-      investment1.valuators << valuator
-      investment2.valuators << valuator
-
       assigned_investment_ids = valuator.assigned_investment_ids
 
       expect(assigned_investment_ids).to match_array [investment1.id, investment2.id]