Add and apply rules for multi-line hashes

For the HashAlignment rule, we're using the default `key` style (keys
are aligned and values aren't) instead of the `table` style (both keys
and values are aligned) because, even if we used both in the
application, we used the `key` style a lot more. Furthermore, the
`table` style looks strange in places where there are both very long and
very short keys and sometimes we weren't even consistent with the
`table` style, aligning some keys without aligning other keys.

Ideally we could align hashes to "either key or table", so developers
can decide whether keeping the symmetry of the code is worth it in a
case-per-case basis, but Rubocop doesn't allow this option.
This commit is contained in:
Javi Martín
2023-07-01 16:17:33 +02:00
parent 97aca0cf95
commit 8b13daad95
130 changed files with 676 additions and 592 deletions

View File

@@ -7,7 +7,7 @@ section "Creating banners" do
description: description,
target_url: target_url,
post_started_at: rand((1.week.ago)..(1.day.ago)),
post_ended_at: rand((1.day.ago)..(1.week.from_now)),
post_ended_at: rand((1.day.ago)..(1.week.from_now)),
created_at: rand((1.week.ago)..Time.current))
I18n.available_locales.map do |locale|
Globalize.with_locale(locale) do

View File

@@ -29,7 +29,7 @@ section "Creating investment milestones" do
rand(0..3).times do
progress_bar = record.progress_bars.build(
kind: :secondary,
kind: :secondary,
percentage: rand(ProgressBar::RANGE)
)

View File

@@ -13,30 +13,30 @@ section "Creating polls" do
create_poll!(name: I18n.t("seeds.polls.current_poll"),
slug: I18n.t("seeds.polls.current_poll").parameterize,
starts_at: 7.days.ago,
ends_at: 7.days.from_now,
ends_at: 7.days.from_now,
geozone_restricted: false)
create_poll!(name: I18n.t("seeds.polls.current_poll_geozone_restricted"),
slug: I18n.t("seeds.polls.current_poll_geozone_restricted").parameterize,
starts_at: 5.days.ago,
ends_at: 5.days.from_now,
ends_at: 5.days.from_now,
geozone_restricted: true,
geozones: Geozone.sample(3))
create_poll!(name: I18n.t("seeds.polls.recounting_poll"),
slug: I18n.t("seeds.polls.recounting_poll").parameterize,
starts_at: 15.days.ago,
ends_at: 2.days.ago)
ends_at: 2.days.ago)
create_poll!(name: I18n.t("seeds.polls.expired_poll_without_stats"),
slug: I18n.t("seeds.polls.expired_poll_without_stats").parameterize,
starts_at: 2.months.ago,
ends_at: 1.month.ago)
ends_at: 1.month.ago)
create_poll!(name: I18n.t("seeds.polls.expired_poll_with_stats"),
slug: I18n.t("seeds.polls.expired_poll_with_stats").parameterize,
starts_at: 2.months.ago,
ends_at: 1.month.ago,
ends_at: 1.month.ago,
results_enabled: true,
stats_enabled: true)

View File

@@ -34,6 +34,6 @@ end
section "Creating SDG homepage cards" do
SDG::Phase.all.each do |phase|
Widget::Card.create!(cardable: phase, title: "#{phase.title} card",
link_text: "Link Text", link_url: "/any_path")
link_text: "Link Text", link_url: "/any_path")
end
end

View File

@@ -2,15 +2,15 @@ section "Creating Users" do
def create_user(email, username)
password = "12345678"
User.create!(
username: username,
email: email,
password: password,
password_confirmation: password,
confirmed_at: Time.current,
terms_of_service: "1",
gender: %w[male female].sample,
date_of_birth: rand((80.years.ago)..(16.years.ago)),
public_activity: (rand(1..100) > 30)
username: username,
email: email,
password: password,
password_confirmation: password,
confirmed_at: Time.current,
terms_of_service: "1",
gender: %w[male female].sample,
date_of_birth: rand((80.years.ago)..(16.years.ago)),
public_activity: (rand(1..100) > 30)
)
end
@@ -23,56 +23,69 @@ section "Creating Users" do
admin = create_user("admin@consul.dev", "admin")
admin.create_administrator
admin.update!(residence_verified_at: Time.current,
confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1",
verified_at: Time.current, document_number: unique_document_number)
confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1",
verified_at: Time.current, document_number: unique_document_number)
moderator = create_user("mod@consul.dev", "moderator")
moderator.create_moderator
moderator.update!(residence_verified_at: Time.current,
confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1",
verified_at: Time.current, document_number: unique_document_number)
confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1",
verified_at: Time.current, document_number: unique_document_number)
manager = create_user("manager@consul.dev", "manager")
manager.create_manager
manager.update!(residence_verified_at: Time.current,
confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1",
verified_at: Time.current, document_number: unique_document_number)
confirmed_phone: Faker::PhoneNumber.phone_number,
document_type: "1",
verified_at: Time.current,
document_number: unique_document_number)
valuator = create_user("valuator@consul.dev", "valuator")
valuator.create_valuator
valuator.update!(residence_verified_at: Time.current,
confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1",
verified_at: Time.current, document_number: unique_document_number)
confirmed_phone: Faker::PhoneNumber.phone_number,
document_type: "1",
verified_at: Time.current,
document_number: unique_document_number)
poll_officer = create_user("poll_officer@consul.dev", "Paul O. Fisher")
poll_officer.create_poll_officer
poll_officer.update!(residence_verified_at: Time.current,
confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1",
verified_at: Time.current, document_number: unique_document_number)
confirmed_phone: Faker::PhoneNumber.phone_number,
document_type: "1",
verified_at: Time.current,
document_number: unique_document_number)
poll_officer2 = create_user("poll_officer2@consul.dev", "Pauline M. Espinosa")
poll_officer2.create_poll_officer
poll_officer2.update!(residence_verified_at: Time.current,
confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1",
verified_at: Time.current, document_number: unique_document_number)
confirmed_phone: Faker::PhoneNumber.phone_number,
document_type: "1",
verified_at: Time.current,
document_number: unique_document_number)
sdg_manager = create_user("sdg_manager@consul.dev", "SDG manager")
sdg_manager.create_sdg_manager
sdg_manager.update!(residence_verified_at: Time.current,
confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1",
verified_at: Time.current, document_number: unique_document_number)
confirmed_phone: Faker::PhoneNumber.phone_number,
document_type: "1",
verified_at: Time.current,
document_number: unique_document_number)
create_user("unverified@consul.dev", "unverified")
level_2 = create_user("leveltwo@consul.dev", "level 2")
level_2.update!(residence_verified_at: Time.current,
confirmed_phone: Faker::PhoneNumber.phone_number,
document_number: unique_document_number, document_type: "1")
confirmed_phone: Faker::PhoneNumber.phone_number,
document_number: unique_document_number,
document_type: "1")
verified = create_user("verified@consul.dev", "verified")
verified.update!(residence_verified_at: Time.current,
confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1",
verified_at: Time.current, document_number: unique_document_number)
confirmed_phone: Faker::PhoneNumber.phone_number,
document_type: "1",
verified_at: Time.current,
document_number: unique_document_number)
[
I18n.t("seeds.organizations.neighborhood_association"),

View File

@@ -2,10 +2,10 @@ class AddTimeZoneToDefaultDatetimes < ActiveRecord::Migration[4.2]
def change
change_column_default :users, :password_changed_at,
from: Time.zone.local(2015, 1, 1, 1, 1, 1),
to: DateTime.new(2015, 1, 1, 1, 1, 1, "+00:00")
to: DateTime.new(2015, 1, 1, 1, 1, 1, "+00:00")
change_column_default :locks, :locked_until,
from: Time.zone.local(2000, 1, 1, 1, 1, 1),
to: DateTime.new(2000, 1, 1, 1, 1, 1, "+00:00")
to: DateTime.new(2000, 1, 1, 1, 1, 1, "+00:00")
end
end