Use with_administrator trait to simplify code

It's more concise than writing `administrator: create(:administrator)`
This commit is contained in:
Javi Martín
2019-09-21 14:18:58 +02:00
parent 2b2c528098
commit 30a30c5f00
2 changed files with 8 additions and 12 deletions

View File

@@ -454,8 +454,7 @@ describe "Admin budget investments" do
end end
scenario "Filtering by assignment status" do scenario "Filtering by assignment status" do
create(:budget_investment, title: "Assigned idea", budget: budget, create(:budget_investment, :with_administrator, title: "Assigned idea", budget: budget)
administrator: create(:administrator))
create(:budget_investment, title: "Evaluating...", budget: budget, create(:budget_investment, title: "Evaluating...", budget: budget,
valuators: [create(:valuator)]) valuators: [create(:valuator)])
create(:budget_investment, title: "With group", budget: budget, create(:budget_investment, title: "With group", budget: budget,
@@ -483,8 +482,7 @@ describe "Admin budget investments" do
end end
scenario "Filtering by valuation status" do scenario "Filtering by valuation status" do
valuating = create(:budget_investment, budget: budget, title: "Ongoing valuation", valuating = create(:budget_investment, :with_administrator, budget: budget, title: "Ongoing valuation")
administrator: create(:administrator))
valuated = create(:budget_investment, budget: budget, title: "Old idea", valuated = create(:budget_investment, budget: budget, title: "Old idea",
valuation_finished: true) valuation_finished: true)
valuating.valuators.push(create(:valuator)) valuating.valuators.push(create(:valuator))
@@ -1667,14 +1665,12 @@ describe "Admin budget investments" do
end end
scenario "Showing the valuating checkbox" do scenario "Showing the valuating checkbox" do
investment1 = create(:budget_investment, budget: budget, visible_to_valuators: true) investment1 = create(:budget_investment, :with_administrator, budget: budget, visible_to_valuators: true)
investment2 = create(:budget_investment, budget: budget, visible_to_valuators: false) investment2 = create(:budget_investment, :with_administrator, budget: budget, visible_to_valuators: false)
investment1.valuators << create(:valuator) investment1.valuators << create(:valuator)
investment2.valuators << create(:valuator) investment2.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) visit admin_budget_budget_investments_path(budget)

View File

@@ -413,7 +413,7 @@ describe Budget::Investment do
describe "without_admin" do describe "without_admin" do
it "returns all open investments without assigned admin" do it "returns all open investments without assigned admin" do
investment1 = create(:budget_investment, valuation_finished: true) investment1 = create(:budget_investment, valuation_finished: true)
investment2 = create(:budget_investment, administrator: create(:administrator)) investment2 = create(:budget_investment, :with_administrator)
investment3 = create(:budget_investment) investment3 = create(:budget_investment)
without_admin = Budget::Investment.without_admin without_admin = Budget::Investment.without_admin
@@ -424,9 +424,9 @@ describe Budget::Investment do
describe "managed" do describe "managed" do
it "returns all open investments with assigned admin but without assigned valuators" do it "returns all open investments with assigned admin but without assigned valuators" do
investment1 = create(:budget_investment, administrator: create(:administrator)) investment1 = create(:budget_investment, :with_administrator)
investment2 = create(:budget_investment, administrator: create(:administrator), valuation_finished: true) investment2 = create(:budget_investment, :with_administrator, valuation_finished: true)
investment3 = create(:budget_investment, administrator: create(:administrator)) investment3 = create(:budget_investment, :with_administrator)
investment1.valuators << create(:valuator) investment1.valuators << create(:valuator)
managed = Budget::Investment.managed managed = Budget::Investment.managed