consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3735 from consul/rubocop_lint

Browse Source 
Add rubocop lint rules
This commit is contained in:
Javier Martín
2019-10-05 15:50:01 +02:00
committed by GitHub
parent fb2476a651 871fa020a5
commit 42dbbf5507
23 changed files with 108 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.rubocop_basic.yml
View File

@@ -117,9 +117,24 @@ Layout/TrailingBlankLines:
Layout/TrailingWhitespace:
Enabled: true
Lint/AmbiguousRegexpLiteral:
Enabled: true
Lint/DuplicateMethods:
Enabled: true
Lint/LiteralAsCondition:
Enabled: true
Lint/ParenthesesAsGroupedExpression:
Enabled: true
Lint/ShadowingOuterLocalVariable:
Enabled: true
Lint/StringConversionInInterpolation:
Enabled: true
Lint/UselessAssignment:
Enabled: true

5
app/controllers/tracking/budget_investments_controller.rb
View File

@@ -58,14 +58,13 @@ class Tracking::BudgetInvestmentsController < Tracking::BaseController
}
]
filters = investment_headings.inject(all_headings_filter) do |filters, heading|
investment_headings.inject(all_headings_filter) do |filters, heading|
filters << {
name: heading.name,
id: heading.id,
count: investments.select { |i| i.heading_id == heading.id }.size
}
end
filters.uniq
end.uniq
end
def restrict_access_to_assigned_items

2
app/helpers/globalize_helper.rb
View File

@@ -131,7 +131,7 @@ module GlobalizeHelper
hidden_field_tag("enabled_translations[#{locale}]", (enabled ? 1 : 0))
end
def globalize(locale, &block)
def globalize(locale)
Globalize.with_locale(locale) do
yield
end

4
app/helpers/translatable_form_helper.rb
View File

@@ -33,7 +33,7 @@ module TranslatableFormHelper
private
def fields_for_locale(locale, &block)
def fields_for_locale(locale)
fields_for_translation(@translations[locale]) do |translations_form|
@template.content_tag :div, translations_options(translations_form.object, locale) do
@template.concat translations_form.hidden_field(
@@ -49,7 +49,7 @@ module TranslatableFormHelper
end
end
def fields_for_translation(translation, &block)
def fields_for_translation(translation)
fields_for(:translations, translation, builder: TranslationsFieldsBuilder) do |f|
yield f
end

2
app/mailers/mailer.rb
View File

@@ -129,7 +129,7 @@ class Mailer < ApplicationMailer
private
def with_user(user, &block)
def with_user(user)
I18n.with_locale(user.locale) do
yield
end

2
app/models/budget/result.rb
View File

@@ -1,7 +1,7 @@
class Budget
class Result
attr_accessor :budget, :heading, :money_spent, :current_investment
attr_accessor :budget, :heading, :current_investment
def initialize(budget, heading)
@budget = budget

6
app/models/poll/partial_result.rb
View File

@@ -21,9 +21,9 @@ class Poll::PartialResult < ApplicationRecord
def update_logs
if amount_changed? && amount_was.present?
self.amount_log += ":#{amount_was.to_s}"
self.officer_assignment_id_log += ":#{officer_assignment_id_was.to_s}"
self.author_id_log += ":#{author_id_was.to_s}"
self.amount_log += ":#{amount_was}"
self.officer_assignment_id_log += ":#{officer_assignment_id_was}"
self.author_id_log += ":#{author_id_was}"
end
end
end

8
db/dev_seeds/polls.rb
View File

@@ -222,10 +222,10 @@ section "Creating Poll Questions from Proposals" do
poll = Poll.current.first
question = Poll::Question.new(poll: poll)
question.copy_attributes_from_proposal(proposal)
title = question.title
question_title = question.title
I18n.available_locales.map do |locale|
Globalize.with_locale(locale) do
question.title = "#{title} (#{locale})"
question.title = "#{question_title} (#{locale})"
end
end
question.save!
@@ -252,10 +252,10 @@ section "Creating Successful Proposals" do
poll = Poll.current.first
question = Poll::Question.new(poll: poll)
question.copy_attributes_from_proposal(proposal)
title = question.title
question_title = question.title
I18n.available_locales.map do |locale|
Globalize.with_locale(locale) do
question.title = "#{title} (#{locale})"
question.title = "#{question_title} (#{locale})"
end
end
question.save!

2
lib/comment_tree.rb
View File

@@ -2,7 +2,7 @@ class CommentTree
ROOT_COMMENTS_PER_PAGE = 10
attr_reader :root_comments, :commentable, :page, :order
attr_reader :commentable, :page, :order
def initialize(commentable, page, order = "confidence_score", valuations: false)
@commentable = commentable

2
lib/email_digest.rb
View File

@@ -1,6 +1,6 @@
class EmailDigest
attr_accessor :user, :notifications
attr_accessor :user
def initialize(user)
@user = user

4
lib/remote_translations/microsoft/available_locales.rb
View File

@@ -34,13 +34,13 @@ class RemoteTranslations::Microsoft::AvailableLocales
host = "https://api.cognitive.microsofttranslator.com"
path = "/languages?api-version=3.0"
uri = URI (host + path)
uri = URI(host + path)
request = Net::HTTP::Get.new(uri)
request["Ocp-Apim-Subscription-Key"] = Rails.application.secrets.microsoft_api_key
response = Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == "https") do |http|
http.request (request)
http.request(request)
end
result = response.body.force_encoding("utf-8")

2
spec/factories/administration.rb
View File

@@ -81,7 +81,7 @@ FactoryBot.define do
header { true }
sequence(:button_text) { |n| "Button text #{n}" }
sequence(:button_url) { |n| "Button url #{n}" }
sequence(:alignment) { |n| "background" }
alignment { "background" }
end
after :create do |widget_card|

12
spec/features/admin/budget_investments_spec.rb
View File

@@ -1773,8 +1773,8 @@ describe "Admin budget investments" do
visit admin_budget_budget_investments_path(budget)
cookies = page.driver.browser.manage.all_cookies
cookie = cookies.find { |cookie| cookie[:name] == "investments-columns" }
cookie_value = cookie[:value]
columns_cookie = cookies.find { |cookie| cookie[:name] == "investments-columns" }
cookie_value = columns_cookie[:value]
expect(cookie_value).to eq("id,title,supports,admin,valuator,geozone," +
"feasibility,price,valuation_finished,visible_to_valuators,selected,incompatible")
@@ -1827,8 +1827,8 @@ describe "Admin budget investments" do
end
cookies = page.driver.browser.manage.all_cookies
cookie = cookies.find { |cookie| cookie[:name] == "investments-columns" }
cookie_value = cookie[:value]
columns_cookie = cookies.find { |cookie| cookie[:name] == "investments-columns" }
cookie_value = columns_cookie[:value]
expect(cookie_value).to eq("id,supports,admin,geozone," +
"feasibility,valuation_finished,visible_to_valuators,selected,incompatible,author")
@@ -1836,8 +1836,8 @@ describe "Admin budget investments" do
visit admin_budget_budget_investments_path(budget)
cookies = page.driver.browser.manage.all_cookies
cookie = cookies.find { |cookie| cookie[:name] == "investments-columns" }
cookie_value = cookie[:value]
columns_cookie = cookies.find { |cookie| cookie[:name] == "investments-columns" }
cookie_value = columns_cookie[:value]
expect(cookie_value).to eq("id,supports,admin,geozone,feasibility,valuation_finished," +
"visible_to_valuators,selected,incompatible,author")

2
spec/features/admin/dashboard/actions_spec.rb
View File

@@ -73,7 +73,7 @@ describe "Admin dashboard actions" do
before do
visit admin_dashboard_actions_path
within ("#dashboard_action_#{action.id}") do
within "#dashboard_action_#{action.id}" do
click_link "Edit"
end
end

4
spec/features/admin/emails/emails_download_spec.rb
View File

@@ -33,8 +33,8 @@ describe "Admin download user emails" do
end
header = page.response_headers["Content-Disposition"]
expect(header).to match /^attachment/
expect(header).to match /filename="Administrators.csv"$/
expect(header).to match(/^attachment/)
expect(header).to match(/filename="Administrators.csv"$/)
file_contents = page.body.split(",")
expect(file_contents).to match_array ["admin_news1@consul.dev", "admin_news2@consul.dev"]

12
spec/features/admin/legislation/processes_spec.rb
View File

@@ -51,13 +51,13 @@ describe "Admin collaborative legislation" do
visit admin_legislation_processes_path(filter: "all")
expect(page).to have_content (process_1.start_date)
expect(page).to have_content (process_2.start_date)
expect(page).to have_content (process_3.start_date)
expect(page).to have_content process_1.start_date
expect(page).to have_content process_2.start_date
expect(page).to have_content process_3.start_date
expect(page).to have_content (process_1.end_date)
expect(page).to have_content (process_2.end_date)
expect(page).to have_content (process_3.end_date)
expect(page).to have_content process_1.end_date
expect(page).to have_content process_2.end_date
expect(page).to have_content process_3.end_date
expect(process_3.title).to appear_before(process_2.title)
expect(process_2.title).to appear_before(process_1.title)

4
spec/features/admin/widgets/cards_spec.rb
View File

@@ -161,7 +161,7 @@ describe "Cards" do
card_2 = create(:widget_card, page: custom_page, title: "Card medium", columns: 4)
card_3 = create(:widget_card, page: custom_page, title: "Card small", columns: 2)
visit (custom_page).url
visit custom_page.url
expect(page).to have_css(".card", count: 3)
@@ -174,7 +174,7 @@ describe "Cards" do
card_1 = create(:widget_card, page: custom_page, title: "Card one", label: "My label")
card_2 = create(:widget_card, page: custom_page, title: "Card two")
visit (custom_page).url
visit custom_page.url
within("#widget_card_#{card_1.id}") do
expect(page).to have_selector("span", text: "My label")

2
spec/features/budgets/investments_spec.rb
View File

@@ -690,7 +690,7 @@ describe "Budget Investments" do
end
scenario "Random order maintained when going back from show" do
per_page.times { |i| create(:budget_investment, heading: heading) }
per_page.times { create(:budget_investment, heading: heading) }
visit budget_investments_path(budget, heading_id: heading.id)

98
spec/lib/remote_census_api_spec.rb
View File

@@ -86,15 +86,15 @@ describe RemoteCensusApi do
request = RemoteCensusApi.new.send(:request, document_type, document_number, nil, nil)
expect(request).to eq ({ :request =>
{ :codigo_institucion => 1,
:codigo_portal => 1,
:codigo_usuario => 1,
:documento => "0123456",
:tipo_documento => "1",
:codigo_idioma => "102",
:nivel => "3" }
})
expect(request).to eq({ :request =>
{ :codigo_institucion => 1,
:codigo_portal => 1,
:codigo_usuario => 1,
:documento => "0123456",
:tipo_documento => "1",
:codigo_idioma => "102",
:nivel => "3" }
})
end
it "when send date_of_birth and postal_code but are not configured" do
@@ -105,15 +105,15 @@ describe RemoteCensusApi do
request = RemoteCensusApi.new.send(:request, document_type, document_number, date_of_birth, postal_code)
expect(request).to eq ({ :request =>
{ :codigo_institucion => 1,
:codigo_portal => 1,
:codigo_usuario => 1,
:documento => "0123456",
:tipo_documento => "1",
:codigo_idioma => "102",
:nivel => "3" }
})
expect(request).to eq({ :request =>
{ :codigo_institucion => 1,
:codigo_portal => 1,
:codigo_usuario => 1,
:documento => "0123456",
:tipo_documento => "1",
:codigo_idioma => "102",
:nivel => "3" }
})
end
it "when send date_of_birth and postal_code but are configured" do
@@ -137,17 +137,17 @@ describe RemoteCensusApi do
request = RemoteCensusApi.new.send(:request, document_type, document_number, date_of_birth, postal_code)
expect(request).to eq ({ :request =>
{ :codigo_institucion => 1,
:codigo_portal => 1,
:codigo_usuario => 1,
:documento => "0123456",
:tipo_documento => "1",
:fecha_nacimiento => "1980-01-01",
:codigo_postal => "28001",
:codigo_idioma => "102",
:nivel => "3" }
})
expect(request).to eq({ :request =>
{ :codigo_institucion => 1,
:codigo_portal => 1,
:codigo_usuario => 1,
:documento => "0123456",
:tipo_documento => "1",
:fecha_nacimiento => "1980-01-01",
:codigo_postal => "28001",
:codigo_idioma => "102",
:nivel => "3" }
})
end
end
@@ -164,26 +164,26 @@ describe RemoteCensusApi do
response = RemoteCensusApi.new.send(:get_response_body, document_type, document_number, nil, nil)
expect(response).to eq ({ get_habita_datos_response: {
get_habita_datos_return: {
datos_habitante: {
item: {
fecha_nacimiento_string: "31-12-1980",
identificador_documento: "12345678Z",
descripcion_sexo: "Varón",
nombre: "José",
apellido1: "García"
}
},
datos_vivienda: {
item: {
codigo_postal: "28013",
codigo_distrito: "01"
}
}
}
}
})
expect(response).to eq({ get_habita_datos_response: {
get_habita_datos_return: {
datos_habitante: {
item: {
fecha_nacimiento_string: "31-12-1980",
identificador_documento: "12345678Z",
descripcion_sexo: "Varón",
nombre: "José",
apellido1: "García"
}
},
datos_vivienda: {
item: {
codigo_postal: "28013",
codigo_distrito: "01"
}
}
}
}
})
end
end

2
spec/models/budget/phase_spec.rb
View File

@@ -171,7 +171,7 @@ describe Budget::Phase do
second_phase.update_attributes(enabled: false,
starts_at: Date.current,
ends_at: Date.current + 2.days)
end.not_to (change { prev_enabled_phase.ends_at })
end.not_to change { prev_enabled_phase.ends_at }
end
it "adjusts next enabled phase start date to its own start date" do

8
spec/models/budget_spec.rb
View File

@@ -277,28 +277,28 @@ describe Budget do
budget.update(currency_symbol: "€")
I18n.locale = :es
expect(budget.formatted_amount(1000.00)).to eq ("1.000 €")
expect(budget.formatted_amount(1000.00)).to eq "1.000 €"
end
it "correctly formats Dollars with Spanish" do
budget.update(currency_symbol: "$")
I18n.locale = :es
expect(budget.formatted_amount(1000.00)).to eq ("1.000 $")
expect(budget.formatted_amount(1000.00)).to eq "1.000 $"
end
it "correctly formats Dollars with English" do
budget.update(currency_symbol: "$")
I18n.locale = :en
expect(budget.formatted_amount(1000.00)).to eq ("$1,000")
expect(budget.formatted_amount(1000.00)).to eq "$1,000"
end
it "correctly formats Euros with English" do
budget.update(currency_symbol: "€")
I18n.locale = :en
expect(budget.formatted_amount(1000.00)).to eq ("€1,000")
expect(budget.formatted_amount(1000.00)).to eq "€1,000"
end
end

2
spec/models/concerns/sluggable.rb
View File

@@ -23,7 +23,7 @@ shared_examples_for "sluggable" do |updatable_slug_trait:|
context "slug updating condition is false" do
it "slug isn't updated" do
expect { sluggable.update_attributes(name: "New Name") }
.not_to (change { sluggable.slug })
.not_to change { sluggable.slug }
end
end
end

2
spec/shared/features/remotely_translatable.rb
View File

@@ -253,5 +253,5 @@ end
def generate_response(resource)
field_text = Faker::Lorem.characters(10)
resource.translated_attribute_names.map { |field| field_text }
resource.translated_attribute_names.map { field_text }
end