Add and apply Style/BlockDelimiters rubocop rule

We were already using it most of the time, but there were a few places
were we used brackets for multiline blocks.
This commit is contained in:
Javi Martín
2019-09-30 13:08:24 +02:00
parent d42b9ff4a5
commit 70a07c095f
38 changed files with 304 additions and 257 deletions

View File

@@ -51,13 +51,13 @@ describe "Admin administrators" do
end
context "Search" do
let!(:administrator1) do
create(:administrator, user: create(:user, username: "Bernard Sumner", email: "bernard@sumner.com"))
end
let!(:administrator1) { create(:administrator, user: create(:user,
username: "Bernard Sumner",
email: "bernard@sumner.com")) }
let!(:administrator2) { create(:administrator, user: create(:user,
username: "Tony Soprano",
email: "tony@soprano.com")) }
let!(:administrator2) do
create(:administrator, user: create(:user, username: "Tony Soprano", email: "tony@soprano.com"))
end
before do
visit admin_administrators_path
@@ -102,9 +102,9 @@ describe "Admin administrators" do
end
context "Edit" do
let!(:administrator1) { create(:administrator, user: create(:user,
username: "Bernard Sumner",
email: "bernard@sumner.com")) }
let!(:administrator1) do
create(:administrator, user: create(:user, username: "Bernard Sumner", email: "bernard@sumner.com"))
end
scenario "admin can edit administrator1" do
visit(edit_admin_administrator_path(administrator1))

View File

@@ -224,14 +224,16 @@ describe "Admin budget headings" do
end
context "Update" do
let(:heading) { create(:budget_heading,
group: group,
name: "All City",
price: 1000,
population: 10000,
longitude: 20.50,
latitude: -10.50,
allow_custom_content: true) }
let(:heading) do
create(:budget_heading,
group: group,
name: "All City",
price: 1000,
population: 10000,
longitude: 20.50,
latitude: -10.50,
allow_custom_content: true)
end
scenario "Updates group" do
visit edit_admin_budget_group_heading_path(budget, group, heading)

View File

@@ -1360,19 +1360,29 @@ describe "Admin budget investments" do
end
context "Selecting" do
let!(:unfeasible_bi) do
create(:budget_investment, :unfeasible, budget: budget, title: "Unfeasible project")
end
let!(:unfeasible_bi) { create(:budget_investment, :unfeasible, budget: budget,
title: "Unfeasible project") }
let!(:feasible_bi) { create(:budget_investment, :feasible, budget: budget,
title: "Feasible project") }
let!(:feasible_vf_bi) { create(:budget_investment, :feasible, :finished, budget: budget,
title: "Feasible, VF project") }
let!(:selected_bi) { create(:budget_investment, :selected, budget: budget,
title: "Selected project") }
let!(:winner_bi) { create(:budget_investment, :winner, budget: budget,
title: "Winner project") }
let!(:undecided_bi) { create(:budget_investment, :undecided, budget: budget,
title: "Undecided project") }
let!(:feasible_bi) do
create(:budget_investment, :feasible, budget: budget, title: "Feasible project")
end
let!(:feasible_vf_bi) do
create(:budget_investment, :feasible, :finished, budget: budget, title: "Feasible, VF project")
end
let!(:selected_bi) do
create(:budget_investment, :selected, budget: budget, title: "Selected project")
end
let!(:winner_bi) do
create(:budget_investment, :winner, budget: budget, title: "Winner project")
end
let!(:undecided_bi) do
create(:budget_investment, :undecided, budget: budget, title: "Undecided project")
end
scenario "Filtering by valuation and selection", :js do
visit admin_budget_budget_investments_path(budget)

View File

@@ -263,26 +263,22 @@ describe "Admin download settings" do
let(:budget_finished) { create(:budget, :finished) }
let(:heading) { create(:budget_heading, budget: budget_finished, price: 1000) }
let(:investment1) { create(:budget_investment,
:selected,
heading: heading,
price: 200,
ballot_lines_count: 900) }
let(:investment2) { create(:budget_investment,
:selected,
heading: heading,
price: 300,
ballot_lines_count: 800) }
let(:investment3) { create(:budget_investment,
:incompatible,
heading: heading,
price: 500,
ballot_lines_count: 700) }
let(:investment4) { create(:budget_investment,
:selected,
heading: heading,
price: 600,
ballot_lines_count: 600) }
let(:investment1) do
create(:budget_investment, :selected, heading: heading, price: 200, ballot_lines_count: 900)
end
let(:investment2) do
create(:budget_investment, :selected, heading: heading, price: 300, ballot_lines_count: 800)
end
let(:investment3) do
create(:budget_investment, :incompatible, heading: heading, price: 500, ballot_lines_count: 700)
end
let(:investment4) do
create(:budget_investment, :selected, heading: heading, price: 600, ballot_lines_count: 600)
end
let(:budget) { create :budget }
before do