Swap @budget instance variable for a let

Why:

Avoid instance variables as we agreed upon with RSpec/InstanceVariable

How:

Using a let(:budget) and replacing all `@budget` with `budget`
This commit is contained in:
Bertocq
2018-03-06 10:56:35 +01:00
parent 0a066f6bb6
commit 9abf9bd87d

View File

@@ -1,13 +1,14 @@
require 'rails_helper'
feature 'Valuation budget investments' do
let(:budget) { create(:budget, :valuating) }
let(:valuator) do
create(:valuator, user: create(:user, username: 'Rachel', email: 'rachel@valuators.org'))
end
background do
login_as(valuator.user)
@budget = create(:budget, :valuating)
end
scenario 'Disabled with a feature flag' do
@@ -23,56 +24,56 @@ feature 'Valuation budget investments' do
end
scenario 'Index shows budget investments assigned to current valuator' do
investment1 = create(:budget_investment, budget: @budget)
investment2 = create(:budget_investment, budget: @budget)
investment1 = create(:budget_investment, budget: budget)
investment2 = create(:budget_investment, budget: budget)
investment1.valuators << valuator
visit valuation_budget_budget_investments_path(@budget)
visit valuation_budget_budget_investments_path(budget)
expect(page).to have_content(investment1.title)
expect(page).not_to have_content(investment2.title)
end
scenario 'Index shows no budget investment to admins no valuators' do
investment1 = create(:budget_investment, budget: @budget)
investment2 = create(:budget_investment, budget: @budget)
investment1 = create(:budget_investment, budget: budget)
investment2 = create(:budget_investment, budget: budget)
investment1.valuators << valuator
logout
login_as create(:administrator).user
visit valuation_budget_budget_investments_path(@budget)
visit valuation_budget_budget_investments_path(budget)
expect(page).not_to have_content(investment1.title)
expect(page).not_to have_content(investment2.title)
end
scenario 'Index orders budget investments by votes' do
investment10 = create(:budget_investment, budget: @budget, cached_votes_up: 10)
investment100 = create(:budget_investment, budget: @budget, cached_votes_up: 100)
investment1 = create(:budget_investment, budget: @budget, cached_votes_up: 1)
investment10 = create(:budget_investment, budget: budget, cached_votes_up: 10)
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
visit valuation_budget_budget_investments_path(@budget)
visit valuation_budget_budget_investments_path(budget)
expect(investment100.title).to appear_before(investment10.title)
expect(investment10.title).to appear_before(investment1.title)
end
scenario "Index filtering by heading", :js do
group = create(:budget_group, budget: @budget)
group = create(:budget_group, budget: budget)
heading1 = create(:budget_heading, name: "District 9", group: group)
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 = 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
visit valuation_budget_budget_investments_path(@budget)
visit valuation_budget_budget_investments_path(budget)
expect(page).to have_link("Realocate visitors")
expect(page).to have_link("Destroy the city")
@@ -100,13 +101,13 @@ feature 'Valuation budget investments' do
filters_links = {'valuating' => 'Under valuation',
'valuation_finished' => 'Valuation finished'}
visit valuation_budget_budget_investments_path(@budget)
visit valuation_budget_budget_investments_path(budget)
expect(page).not_to have_link(filters_links.values.first)
filters_links.keys.drop(1).each { |filter| expect(page).to have_link(filters_links[filter]) }
filters_links.each_pair do |current_filter, link|
visit valuation_budget_budget_investments_path(@budget, filter: current_filter)
visit valuation_budget_budget_investments_path(budget, filter: current_filter)
expect(page).not_to have_link(link)
@@ -117,22 +118,22 @@ feature 'Valuation budget investments' do
end
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 = 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
visit valuation_budget_budget_investments_path(@budget)
visit valuation_budget_budget_investments_path(budget)
expect(page).to have_content("Ongoing valuation")
expect(page).not_to have_content("Old idea")
visit valuation_budget_budget_investments_path(@budget, filter: 'valuating')
visit valuation_budget_budget_investments_path(budget, filter: 'valuating')
expect(page).to have_content("Ongoing valuation")
expect(page).not_to have_content("Old idea")
visit valuation_budget_budget_investments_path(@budget, filter: 'valuation_finished')
visit valuation_budget_budget_investments_path(budget, filter: 'valuation_finished')
expect(page).not_to have_content("Ongoing valuation")
expect(page).to have_content("Old idea")
@@ -143,14 +144,14 @@ feature 'Valuation budget investments' do
administrator = create(:administrator, user: create(:user, username: 'Ana', email: 'ana@admins.org'))
valuator2 = create(:valuator, user: create(:user, username: 'Rick', email: 'rick@valuators.org'))
investment = create(:budget_investment,
budget: @budget,
budget: budget,
price: 1234,
feasibility: 'unfeasible',
unfeasibility_explanation: 'It is impossible',
administrator: administrator)
investment.valuators << [valuator, valuator2]
visit valuation_budget_budget_investments_path(@budget)
visit valuation_budget_budget_investments_path(budget)
click_link investment.title
@@ -176,14 +177,14 @@ feature 'Valuation budget investments' do
administrator = create(:administrator, user: create(:user, username: 'Ana', email: 'ana@admins.org'))
valuator2 = create(:valuator, user: create(:user, username: 'Rick', email: 'rick@valuators.org'))
investment = create(:budget_investment,
budget: @budget,
budget: budget,
price: 1234,
feasibility: 'unfeasible',
unfeasibility_explanation: 'It is impossible',
administrator: administrator)
investment.valuators << [valuator, valuator2]
visit valuation_budget_budget_investment_path(@budget, investment)
visit valuation_budget_budget_investment_path(budget, investment)
expect(page).to have_content(investment.title)
expect(page).to have_content(investment.description)
@@ -206,14 +207,14 @@ feature 'Valuation budget investments' do
valuator2 = create(:valuator, user: create(:user, username: 'Rick', email: 'rick@valuators.org'))
investment = create(:budget_investment,
budget: @budget,
budget: budget,
price: 1234,
feasibility: 'unfeasible',
unfeasibility_explanation: 'It is impossible',
administrator: create(:administrator))
investment.valuators << [valuator, valuator2]
expect { visit valuation_budget_budget_investment_path(@budget, investment) }.to raise_error "Not Found"
expect { visit valuation_budget_budget_investment_path(budget, investment) }.to raise_error "Not Found"
end
end
@@ -221,14 +222,14 @@ feature 'Valuation budget investments' do
feature 'Valuate' do
background do
@investment = create(:budget_investment,
budget: @budget,
budget: budget,
price: nil,
administrator: create(:administrator))
@investment.valuators << valuator
end
scenario 'Dossier empty by default' do
visit valuation_budget_budget_investments_path(@budget)
visit valuation_budget_budget_investments_path(budget)
click_link @investment.title
within('#price') { expect(page).to have_content('Undefined') }
@@ -239,7 +240,7 @@ feature 'Valuation budget investments' do
end
scenario 'Edit dossier' do
visit valuation_budget_budget_investments_path(@budget)
visit valuation_budget_budget_investments_path(budget)
within("#budget_investment_#{@investment.id}") do
click_link "Edit dossier"
end
@@ -253,7 +254,7 @@ feature 'Valuation budget investments' do
expect(page).to have_content "Dossier updated"
visit valuation_budget_budget_investments_path(@budget)
visit valuation_budget_budget_investments_path(budget)
click_link @investment.title
within('#price') { expect(page).to have_content('12345') }
@@ -265,14 +266,14 @@ feature 'Valuation budget investments' do
end
scenario 'Feasibility can be marked as pending' do
visit valuation_budget_budget_investment_path(@budget, @investment)
visit valuation_budget_budget_investment_path(budget, @investment)
click_link 'Edit dossier'
expect(find("#budget_investment_feasibility_undecided")).to be_checked
choose 'budget_investment_feasibility_feasible'
click_button 'Save changes'
visit edit_valuation_budget_budget_investment_path(@budget, @investment)
visit edit_valuation_budget_budget_investment_path(budget, @investment)
expect(find("#budget_investment_feasibility_undecided")).not_to be_checked
expect(find("#budget_investment_feasibility_feasible")).to be_checked
@@ -280,7 +281,7 @@ feature 'Valuation budget investments' do
choose 'budget_investment_feasibility_undecided'
click_button 'Save changes'
visit edit_valuation_budget_budget_investment_path(@budget, @investment)
visit edit_valuation_budget_budget_investment_path(budget, @investment)
expect(find("#budget_investment_feasibility_undecided")).to be_checked
end
@@ -290,7 +291,7 @@ feature 'Valuation budget investments' do
any_feasibility_fields = ['Valuation finished']
undecided_fields = feasible_fields + unfeasible_fields + any_feasibility_fields
visit edit_valuation_budget_budget_investment_path(@budget, @investment)
visit edit_valuation_budget_budget_investment_path(budget, @investment)
expect(find("#budget_investment_feasibility_undecided")).to be_checked
@@ -320,7 +321,7 @@ feature 'Valuation budget investments' do
click_button 'Save changes'
visit edit_valuation_budget_budget_investment_path(@budget, @investment)
visit edit_valuation_budget_budget_investment_path(budget, @investment)
expect(find("#budget_investment_feasibility_unfeasible")).to be_checked
feasible_fields.each do |field|
@@ -339,13 +340,13 @@ feature 'Valuation budget investments' do
end
scenario 'Finish valuation' do
visit valuation_budget_budget_investment_path(@budget, @investment)
visit valuation_budget_budget_investment_path(budget, @investment)
click_link 'Edit dossier'
find_field('budget_investment[valuation_finished]').click
click_button 'Save changes'
visit valuation_budget_budget_investments_path(@budget)
visit valuation_budget_budget_investments_path(budget)
expect(page).not_to have_content @investment.title
click_link 'Valuation finished'
@@ -355,7 +356,7 @@ feature 'Valuation budget investments' do
end
scenario 'Validates price formats' do
visit valuation_budget_budget_investments_path(@budget)
visit valuation_budget_budget_investments_path(budget)
within("#budget_investment_#{@investment.id}") do
click_link "Edit dossier"
end