From 0a066f6bb6ab2e283da0ed70f514c94df90f273c Mon Sep 17 00:00:00 2001 From: Bertocq Date: Tue, 6 Mar 2018 10:54:22 +0100 Subject: [PATCH] Swap @valuator instance variable for a let Why: Avoid instance variables as we agreed upon with RSpec/InstanceVariable How: Using a let(:valuator) and replacing all `@valuator` with `valuator` --- .../valuation/budget_investments_spec.rb | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/spec/features/valuation/budget_investments_spec.rb b/spec/features/valuation/budget_investments_spec.rb index 7d8d1bfd5..b69a5db28 100644 --- a/spec/features/valuation/budget_investments_spec.rb +++ b/spec/features/valuation/budget_investments_spec.rb @@ -1,10 +1,12 @@ require 'rails_helper' feature 'Valuation budget investments' do + let(:valuator) do + create(:valuator, user: create(:user, username: 'Rachel', email: 'rachel@valuators.org')) + end background do - @valuator = create(:valuator, user: create(:user, username: 'Rachel', email: 'rachel@valuators.org')) - login_as(@valuator.user) + login_as(valuator.user) @budget = create(:budget, :valuating) end @@ -24,7 +26,7 @@ feature 'Valuation budget investments' do investment1 = create(:budget_investment, budget: @budget) investment2 = create(:budget_investment, budget: @budget) - investment1.valuators << @valuator + investment1.valuators << valuator visit valuation_budget_budget_investments_path(@budget) @@ -36,7 +38,7 @@ feature 'Valuation budget investments' do investment1 = create(:budget_investment, budget: @budget) investment2 = create(:budget_investment, budget: @budget) - investment1.valuators << @valuator + investment1.valuators << valuator logout login_as create(:administrator).user @@ -51,9 +53,9 @@ feature 'Valuation budget investments' do investment100 = create(:budget_investment, budget: @budget, cached_votes_up: 100) investment1 = create(:budget_investment, budget: @budget, cached_votes_up: 1) - investment1.valuators << @valuator - investment10.valuators << @valuator - investment100.valuators << @valuator + investment1.valuators << valuator + investment10.valuators << valuator + investment100.valuators << valuator visit valuation_budget_budget_investments_path(@budget) @@ -67,8 +69,8 @@ feature 'Valuation budget investments' do heading2 = create(:budget_heading, name: "Down to the river", group: group) investment1 = create(:budget_investment, title: "Realocate visitors", heading: heading1, group: group, budget: @budget) investment2 = create(:budget_investment, title: "Destroy the city", heading: heading2, group: group, budget: @budget) - investment1.valuators << @valuator - investment2.valuators << @valuator + investment1.valuators << valuator + investment2.valuators << valuator visit valuation_budget_budget_investments_path(@budget) @@ -117,8 +119,8 @@ feature 'Valuation budget investments' do scenario "Index filtering by valuation status" do valuating = create(:budget_investment, budget: @budget, title: "Ongoing valuation") valuated = create(:budget_investment, budget: @budget, title: "Old idea", valuation_finished: true) - valuating.valuators << @valuator - valuated.valuators << @valuator + valuating.valuators << valuator + valuated.valuators << valuator visit valuation_budget_budget_investments_path(@budget) @@ -146,7 +148,7 @@ feature 'Valuation budget investments' do feasibility: 'unfeasible', unfeasibility_explanation: 'It is impossible', administrator: administrator) - investment.valuators << [@valuator, valuator2] + investment.valuators << [valuator, valuator2] visit valuation_budget_budget_investments_path(@budget) @@ -179,7 +181,7 @@ feature 'Valuation budget investments' do feasibility: 'unfeasible', unfeasibility_explanation: 'It is impossible', administrator: administrator) - investment.valuators << [@valuator, valuator2] + investment.valuators << [valuator, valuator2] visit valuation_budget_budget_investment_path(@budget, investment) @@ -209,7 +211,7 @@ feature 'Valuation budget investments' do feasibility: 'unfeasible', unfeasibility_explanation: 'It is impossible', administrator: create(:administrator)) - investment.valuators << [@valuator, valuator2] + investment.valuators << [valuator, valuator2] expect { visit valuation_budget_budget_investment_path(@budget, investment) }.to raise_error "Not Found" end @@ -222,7 +224,7 @@ feature 'Valuation budget investments' do budget: @budget, price: nil, administrator: create(:administrator)) - @investment.valuators << @valuator + @investment.valuators << valuator end scenario 'Dossier empty by default' do