diff --git a/app/models/valuator.rb b/app/models/valuator.rb index 625395f0c..994f7ba58 100644 --- a/app/models/valuator.rb +++ b/app/models/valuator.rb @@ -18,7 +18,7 @@ class Valuator < ApplicationRecord end def assigned_investment_ids - investment_ids + [valuator_group&.investment_ids].flatten + investment_ids + valuator_group&.investment_ids.to_a end end diff --git a/spec/models/valuator_spec.rb b/spec/models/valuator_spec.rb index 7f1efa3c7..021d47d33 100644 --- a/spec/models/valuator_spec.rb +++ b/spec/models/valuator_spec.rb @@ -28,8 +28,8 @@ describe Valuator do investment2.valuators << valuator assigned_investment_ids = valuator.assigned_investment_ids - expect(assigned_investment_ids).to include investment1.id - expect(assigned_investment_ids).to include investment2.id + + expect(assigned_investment_ids).to match_array [investment1.id, investment2.id] expect(assigned_investment_ids).not_to include investment3.id end @@ -45,8 +45,8 @@ describe Valuator do investment2.valuator_groups << group assigned_investment_ids = valuator.assigned_investment_ids - expect(assigned_investment_ids).to include investment1.id - expect(assigned_investment_ids).to include investment2.id + + expect(assigned_investment_ids).to match_array [investment1.id, investment2.id] expect(assigned_investment_ids).not_to include investment3.id end end