From 30a30c5f00781d02fc446bdadd4614694c51d144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sat, 21 Sep 2019 14:18:58 +0200 Subject: [PATCH] Use `with_administrator` trait to simplify code It's more concise than writing `administrator: create(:administrator)` --- spec/features/admin/budget_investments_spec.rb | 12 ++++-------- spec/models/budget/investment_spec.rb | 8 ++++---- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/features/admin/budget_investments_spec.rb index 485a1ead1..74bcd0980 100644 --- a/spec/features/admin/budget_investments_spec.rb +++ b/spec/features/admin/budget_investments_spec.rb @@ -454,8 +454,7 @@ describe "Admin budget investments" do end scenario "Filtering by assignment status" do - create(:budget_investment, title: "Assigned idea", budget: budget, - administrator: create(:administrator)) + create(:budget_investment, :with_administrator, title: "Assigned idea", budget: budget) create(:budget_investment, title: "Evaluating...", budget: budget, valuators: [create(:valuator)]) create(:budget_investment, title: "With group", budget: budget, @@ -483,8 +482,7 @@ describe "Admin budget investments" do end scenario "Filtering by valuation status" do - valuating = create(:budget_investment, budget: budget, title: "Ongoing valuation", - administrator: create(:administrator)) + valuating = create(:budget_investment, :with_administrator, budget: budget, title: "Ongoing valuation") valuated = create(:budget_investment, budget: budget, title: "Old idea", valuation_finished: true) valuating.valuators.push(create(:valuator)) @@ -1667,14 +1665,12 @@ describe "Admin budget investments" do end scenario "Showing the valuating checkbox" do - investment1 = create(:budget_investment, budget: budget, visible_to_valuators: true) - investment2 = create(:budget_investment, budget: budget, visible_to_valuators: false) + investment1 = create(:budget_investment, :with_administrator, budget: budget, visible_to_valuators: true) + investment2 = create(:budget_investment, :with_administrator, budget: budget, visible_to_valuators: false) investment1.valuators << create(:valuator) investment2.valuators << create(:valuator) investment2.valuators << create(:valuator) - investment1.update(administrator: create(:administrator)) - investment2.update(administrator: create(:administrator)) visit admin_budget_budget_investments_path(budget) diff --git a/spec/models/budget/investment_spec.rb b/spec/models/budget/investment_spec.rb index ef75f13ba..a6c9d76c5 100644 --- a/spec/models/budget/investment_spec.rb +++ b/spec/models/budget/investment_spec.rb @@ -413,7 +413,7 @@ describe Budget::Investment do describe "without_admin" do it "returns all open investments without assigned admin" do investment1 = create(:budget_investment, valuation_finished: true) - investment2 = create(:budget_investment, administrator: create(:administrator)) + investment2 = create(:budget_investment, :with_administrator) investment3 = create(:budget_investment) without_admin = Budget::Investment.without_admin @@ -424,9 +424,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, administrator: create(:administrator)) - investment2 = create(:budget_investment, administrator: create(:administrator), valuation_finished: true) - investment3 = create(:budget_investment, administrator: create(:administrator)) + investment1 = create(:budget_investment, :with_administrator) + investment2 = create(:budget_investment, :with_administrator, valuation_finished: true) + investment3 = create(:budget_investment, :with_administrator) investment1.valuators << create(:valuator) managed = Budget::Investment.managed