Add and apply Style/LineEndConcatenation rule

We were already using it in most places.

Note that enabling this rule means we've got to change a few lines in
order to follow the LineEndStringConcatenationIndentation rule. In the
link list tests, the easiest way to do so was to use heredoc instead,
which IMHO improves readability over the previous version.
This commit is contained in:
Javi Martín
2023-07-18 03:36:22 +02:00
parent 96a0aa2a88
commit cbda85c48d
3 changed files with 21 additions and 12 deletions

View File

@@ -573,6 +573,9 @@ Style/IdenticalConditionalBranches:
Style/IfWithBooleanLiteralBranches: Style/IfWithBooleanLiteralBranches:
Enabled: true Enabled: true
Style/LineEndConcatenation:
Enabled: true
Style/MapToHash: Style/MapToHash:
Enabled: true Enabled: true

View File

@@ -18,9 +18,12 @@ describe Shared::LinkListComponent do
["Home", "/"], ["Info", "/info"], class: "menu" ["Home", "/"], ["Info", "/info"], class: "menu"
) )
expect(page).to be_rendered with: '<ul class="menu">' + "\n" + expect(page).to be_rendered with: <<~HTML
'<li><a href="/">Home</a></li>' + "\n" + <ul class="menu">
'<li><a href="/info">Info</a></li>' + "\n</ul>\n" <li><a href="/">Home</a></li>
<li><a href="/info">Info</a></li>
</ul>
HTML
end end
it "accepts anchor tags" do it "accepts anchor tags" do
@@ -28,9 +31,12 @@ describe Shared::LinkListComponent do
'<a href="/">Home</a>'.html_safe, ["Info", "/info"], class: "menu" '<a href="/">Home</a>'.html_safe, ["Info", "/info"], class: "menu"
) )
expect(page).to be_rendered with: '<ul class="menu">' + "\n" + expect(page).to be_rendered with: <<~HTML
'<li><a href="/">Home</a></li>' + "\n" + <ul class="menu">
'<li><a href="/info">Info</a></li>' + "\n</ul>\n" <li><a href="/">Home</a></li>
<li><a href="/info">Info</a></li>
</ul>
HTML
end end
it "accepts options for links" do it "accepts options for links" do

View File

@@ -1797,8 +1797,8 @@ describe "Admin budget investments", :admin do
columns_cookie = cookies.find { |cookie| cookie[:name] == "investments-columns" } columns_cookie = cookies.find { |cookie| cookie[:name] == "investments-columns" }
cookie_value = columns_cookie[:value] cookie_value = columns_cookie[:value]
expect(cookie_value).to eq("id,title,supports,admin,valuator,geozone," + expect(cookie_value).to eq("id,title,supports,admin,valuator,geozone,feasibility,price," \
"feasibility,price,valuation_finished,visible_to_valuators,selected,incompatible") "valuation_finished,visible_to_valuators,selected,incompatible")
end end
scenario "Use column selector to display visible columns" do scenario "Use column selector to display visible columns" do
@@ -1847,8 +1847,8 @@ describe "Admin budget investments", :admin do
columns_cookie = cookies.find { |cookie| cookie[:name] == "investments-columns" } columns_cookie = cookies.find { |cookie| cookie[:name] == "investments-columns" }
cookie_value = columns_cookie[:value] cookie_value = columns_cookie[:value]
expect(cookie_value).to eq("id,supports,admin,geozone," + expect(cookie_value).to eq("id,supports,admin,geozone,feasibility,valuation_finished," \
"feasibility,valuation_finished,visible_to_valuators,selected,incompatible,author") "visible_to_valuators,selected,incompatible,author")
visit admin_budget_budget_investments_path(budget) visit admin_budget_budget_investments_path(budget)
@@ -1856,8 +1856,8 @@ describe "Admin budget investments", :admin do
columns_cookie = cookies.find { |cookie| cookie[:name] == "investments-columns" } columns_cookie = cookies.find { |cookie| cookie[:name] == "investments-columns" }
cookie_value = columns_cookie[:value] cookie_value = columns_cookie[:value]
expect(cookie_value).to eq("id,supports,admin,geozone,feasibility,valuation_finished," + expect(cookie_value).to eq("id,supports,admin,geozone,feasibility,valuation_finished," \
"visible_to_valuators,selected,incompatible,author") "visible_to_valuators,selected,incompatible,author")
end end
scenario "Select an investment when some columns are not displayed" do scenario "Select an investment when some columns are not displayed" do