diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/features/admin/budget_investments_spec.rb index f093132b0..703d1d5fd 100644 --- a/spec/features/admin/budget_investments_spec.rb +++ b/spec/features/admin/budget_investments_spec.rb @@ -127,12 +127,9 @@ describe "Admin budget investments" do group1_heading2 = create(:budget_heading, group: group1, name: "Mercy Street") group2_heading1 = create(:budget_heading, group: group2, name: "Central Park") - create(:budget_investment, title: "Realocate visitors", budget: budget, group: group1, - heading: group1_heading1) - create(:budget_investment, title: "Change name", budget: budget, group: group1, - heading: group1_heading2) - create(:budget_investment, title: "Plant trees", budget: budget, group: group2, - heading: group2_heading1) + create(:budget_investment, title: "Realocate visitors", heading: group1_heading1) + create(:budget_investment, title: "Change name", heading: group1_heading2) + create(:budget_investment, title: "Plant trees", heading: group2_heading1) visit admin_budget_budget_investments_path(budget_id: budget.id) diff --git a/spec/features/budgets/investments_spec.rb b/spec/features/budgets/investments_spec.rb index 7abce3ab8..7352ff3bf 100644 --- a/spec/features/budgets/investments_spec.rb +++ b/spec/features/budgets/investments_spec.rb @@ -1120,7 +1120,6 @@ describe "Budget Investments" do :feasible, :finished, budget: budget, - group: group, heading: heading, price: 16, price_explanation: "Every wheel is 4 euros, so total is 16") @@ -1146,7 +1145,6 @@ describe "Budget Investments" do investment = create(:budget_investment, :unfeasible, budget: budget, - group: group, heading: heading, unfeasibility_explanation: "Local government is not competent in this") @@ -1154,7 +1152,6 @@ describe "Budget Investments" do :unfeasible, :finished, budget: budget, - group: group, heading: heading, unfeasibility_explanation: "The unfeasible explanation") @@ -1182,7 +1179,6 @@ describe "Budget Investments" do :finished, :selected, budget: budget, - group: group, heading: heading) user = create(:user) @@ -1202,7 +1198,6 @@ describe "Budget Investments" do :selected, :winner, budget: budget, - group: group, heading: heading) user = create(:user) @@ -1226,7 +1221,6 @@ describe "Budget Investments" do :feasible, :finished, budget: budget, - group: group, heading: heading) user = create(:user) @@ -1242,7 +1236,6 @@ describe "Budget Investments" do :feasible, :finished, budget: budget, - group: group, heading: heading) user = create(:user) @@ -1261,7 +1254,6 @@ describe "Budget Investments" do :unfeasible, :unfinished, budget: budget, - group: group, heading: heading, unfeasibility_explanation: "Local government is not competent in this matter") diff --git a/spec/features/budgets/votes_spec.rb b/spec/features/budgets/votes_spec.rb index 148402f6f..9e004ddf5 100644 --- a/spec/features/budgets/votes_spec.rb +++ b/spec/features/budgets/votes_spec.rb @@ -39,7 +39,7 @@ describe "Votes" do end scenario "Create from investments' index", :js do - create(:budget_investment, heading: heading, budget: budget) + create(:budget_investment, heading: heading) visit budget_investments_path(budget, heading_id: heading.id) @@ -54,7 +54,7 @@ describe "Votes" do end describe "Single investment" do - let(:investment) { create(:budget_investment, budget: budget, heading: heading) } + let(:investment) { create(:budget_investment, heading: heading) } scenario "Show no votes" do visit budget_investment_path(budget, investment) @@ -87,7 +87,7 @@ describe "Votes" do scenario "Disable voting on investments", :js do budget.update(phase: "reviewing") - investment = create(:budget_investment, budget: budget, heading: heading) + investment = create(:budget_investment, heading: heading) manuela = create(:user, verified_at: Time.current) login_as(manuela) diff --git a/spec/features/management/budget_investments_spec.rb b/spec/features/management/budget_investments_spec.rb index f4693051a..e8c52633d 100644 --- a/spec/features/management/budget_investments_spec.rb +++ b/spec/features/management/budget_investments_spec.rb @@ -265,7 +265,7 @@ describe "Budget Investments" do context "Supporting" do scenario "Supporting budget investments on behalf of someone in index view", :js do - budget_investment = create(:budget_investment, budget: budget, heading: heading) + budget_investment = create(:budget_investment, heading: heading) user = create(:user, :level_two) login_managed_user(user) @@ -322,7 +322,7 @@ describe "Budget Investments" do context "Printing" do scenario "Printing budget investments" do - 16.times { create(:budget_investment, budget: budget, heading: heading) } + 16.times { create(:budget_investment, heading: heading) } click_link "Print budget investments" diff --git a/spec/features/valuation/budget_investments_spec.rb b/spec/features/valuation/budget_investments_spec.rb index 2a4249637..b96012be0 100644 --- a/spec/features/valuation/budget_investments_spec.rb +++ b/spec/features/valuation/budget_investments_spec.rb @@ -119,22 +119,18 @@ describe "Valuation budget investments" do finished_heading = create(:budget_heading, name: "Only Finished", group: group) create(:budget_investment, :visible_to_valuators, title: "Valuating Investment ONE", heading: valuating_heading, - group: group, budget: budget, valuators: [valuator]) create(:budget_investment, :visible_to_valuators, title: "Valuating Investment TWO", heading: valuating_finished_heading, - group: group, budget: budget, valuators: [valuator]) create(:budget_investment, :visible_to_valuators, :finished, title: "Finished ONE", heading: valuating_finished_heading, - group: group, budget: budget, valuators: [valuator]) create(:budget_investment, :visible_to_valuators, :finished, title: "Finished TWO", heading: finished_heading, - group: group, budget: budget, valuators: [valuator]) diff --git a/spec/models/budget/investment_spec.rb b/spec/models/budget/investment_spec.rb index 29ec5876b..4a740af0b 100644 --- a/spec/models/budget/investment_spec.rb +++ b/spec/models/budget/investment_spec.rb @@ -638,9 +638,9 @@ describe Budget::Investment do heading1 = create(:budget_heading, group: group) heading2 = create(:budget_heading, group: group) - investment1 = create(:budget_investment, heading: heading1, budget: budget) - investment2 = create(:budget_investment, heading: heading1, budget: budget) - investment3 = create(:budget_investment, heading: heading2, budget: budget) + investment1 = create(:budget_investment, heading: heading1) + investment2 = create(:budget_investment, heading: heading1) + investment3 = create(:budget_investment, heading: heading2) results = Budget::Investment.apply_filters_and_search(budget, heading_id: heading1.id) @@ -720,7 +720,7 @@ describe Budget::Investment do let(:heading) { create(:budget_heading, group: group) } let(:user) { create(:user, :level_two) } let(:luser) { create(:user) } - let(:district_sp) { create(:budget_investment, budget: budget, group: group, heading: heading) } + let(:district_sp) { create(:budget_investment, budget: budget, heading: heading) } describe "#reason_for_not_being_selectable_by" do it "rejects not logged in users" do @@ -992,8 +992,8 @@ describe Budget::Investment do california = create(:budget_heading, group: group) new_york = create(:budget_heading, group: group) - inv1 = create(:budget_investment, :selected, budget: budget, group: group, heading: california) - inv2 = create(:budget_investment, :selected, budget: budget, group: group, heading: new_york) + inv1 = create(:budget_investment, :selected, budget: budget, heading: california) + inv2 = create(:budget_investment, :selected, budget: budget, heading: new_york) ballot = create(:budget_ballot, user: user, budget: budget) ballot.investments << inv1 @@ -1004,8 +1004,8 @@ describe Budget::Investment do budget.phase = "balloting" districts = create(:budget_group, budget: budget) carabanchel = create(:budget_heading, group: districts, price: 35) - inv1 = create(:budget_investment, :selected, budget: budget, group: districts, heading: carabanchel, price: 30) - inv2 = create(:budget_investment, :selected, budget: budget, group: districts, heading: carabanchel, price: 10) + inv1 = create(:budget_investment, :selected, budget: budget, heading: carabanchel, price: 30) + inv2 = create(:budget_investment, :selected, budget: budget, heading: carabanchel, price: 10) ballot = create(:budget_ballot, user: user, budget: budget) ballot.investments << inv1