From 65c9786db7415f924cb3ac1e7aef1222e7fba22b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Wed, 11 Aug 2021 19:17:31 +0200 Subject: [PATCH] Apply Layout/RedundantLineBreak rule to short lines We're not adding the rule because it would apply the current line length rule of 110 characters per line. We still haven't decided whether we'll keep that rule or make lines shorter so they're easier to read, particularly when vertically splitting the editor window. So, for now, I'm applying the rule to lines which are about 90 characters long. --- .../admin/administrators_controller.rb | 4 +- app/controllers/admin/managers_controller.rb | 4 +- .../admin/milestone_statuses_controller.rb | 9 +-- .../admin/moderators_controller.rb | 4 +- .../poll/booth_assignments_controller.rb | 3 +- .../content_blocks_controller.rb | 6 +- .../site_customization/images_controller.rb | 4 +- .../information_texts_controller.rb | 7 +- app/controllers/admin/valuators_controller.rb | 4 +- app/controllers/installation_controller.rb | 4 +- .../legislation/answers_controller.rb | 4 +- .../valuation/budgets_controller.rb | 4 +- app/helpers/followables_helper.rb | 5 +- app/helpers/images_helper.rb | 4 +- app/helpers/site_customization_helper.rb | 5 +- app/models/budget/investment.rb | 3 +- app/models/budget/reclassification.rb | 4 +- app/models/dashboard/action.rb | 5 +- app/models/organization.rb | 6 +- app/models/poll.rb | 6 +- app/models/related_content_score.rb | 5 +- app/models/verification/letter.rb | 3 +- config/environments/test.rb | 4 +- lib/active_model/dates.rb | 4 +- lib/tasks/proposal_actions.rake | 6 +- .../admin/budgets/form_component_spec.rb | 5 +- spec/helpers/locales_helper_spec.rb | 3 +- spec/i18n_spec.rb | 8 +- spec/models/administrator_spec.rb | 4 +- spec/models/budget/investment_spec.rb | 26 ++----- spec/models/comment_spec.rb | 6 +- spec/models/concerns/sluggable.rb | 3 +- spec/models/debate_spec.rb | 15 ++-- spec/models/i18n_content_spec.rb | 38 ++-------- spec/models/poll/poll_spec.rb | 3 +- spec/models/proposal_spec.rb | 15 ++-- spec/models/user_spec.rb | 18 ++--- spec/system/admin/budget_investments_spec.rb | 32 ++------ spec/system/admin/proposals_spec.rb | 4 +- spec/system/debates_spec.rb | 10 +-- spec/system/polls/polls_spec.rb | 6 +- spec/system/proposals_spec.rb | 10 +-- .../system/verification/verified_user_spec.rb | 73 +++++-------------- spec/system/welcome_spec.rb | 17 +---- 44 files changed, 103 insertions(+), 310 deletions(-) diff --git a/app/controllers/admin/administrators_controller.rb b/app/controllers/admin/administrators_controller.rb index 2eb2b1bfc..da0cabb3d 100644 --- a/app/controllers/admin/administrators_controller.rb +++ b/app/controllers/admin/administrators_controller.rb @@ -6,9 +6,7 @@ class Admin::AdministratorsController < Admin::BaseController end def search - @users = User.search(params[:search]) - .includes(:administrator) - .page(params[:page]) + @users = User.search(params[:search]).includes(:administrator).page(params[:page]) end def create diff --git a/app/controllers/admin/managers_controller.rb b/app/controllers/admin/managers_controller.rb index 6aff620a8..be9211509 100644 --- a/app/controllers/admin/managers_controller.rb +++ b/app/controllers/admin/managers_controller.rb @@ -6,9 +6,7 @@ class Admin::ManagersController < Admin::BaseController end def search - @users = User.search(params[:search]) - .includes(:manager) - .page(params[:page]) + @users = User.search(params[:search]).includes(:manager).page(params[:page]) end def create diff --git a/app/controllers/admin/milestone_statuses_controller.rb b/app/controllers/admin/milestone_statuses_controller.rb index f4defb2b3..88e66f90a 100644 --- a/app/controllers/admin/milestone_statuses_controller.rb +++ b/app/controllers/admin/milestone_statuses_controller.rb @@ -13,8 +13,7 @@ class Admin::MilestoneStatusesController < Admin::BaseController @status = Milestone::Status.new(status_params) if @status.save - redirect_to admin_milestone_statuses_path, - notice: t("admin.statuses.create.notice") + redirect_to admin_milestone_statuses_path, notice: t("admin.statuses.create.notice") else render :new end @@ -25,8 +24,7 @@ class Admin::MilestoneStatusesController < Admin::BaseController def update if @status.update(status_params) - redirect_to admin_milestone_statuses_path, - notice: t("admin.statuses.update.notice") + redirect_to admin_milestone_statuses_path, notice: t("admin.statuses.update.notice") else render :edit end @@ -34,8 +32,7 @@ class Admin::MilestoneStatusesController < Admin::BaseController def destroy @status.destroy! - redirect_to admin_milestone_statuses_path, - notice: t("admin.statuses.delete.notice") + redirect_to admin_milestone_statuses_path, notice: t("admin.statuses.delete.notice") end private diff --git a/app/controllers/admin/moderators_controller.rb b/app/controllers/admin/moderators_controller.rb index 954d9edc3..6b803c8d9 100644 --- a/app/controllers/admin/moderators_controller.rb +++ b/app/controllers/admin/moderators_controller.rb @@ -6,9 +6,7 @@ class Admin::ModeratorsController < Admin::BaseController end def search - @users = User.search(params[:search]) - .includes(:moderator) - .page(params[:page]) + @users = User.search(params[:search]).includes(:moderator).page(params[:page]) end def create diff --git a/app/controllers/admin/poll/booth_assignments_controller.rb b/app/controllers/admin/poll/booth_assignments_controller.rb index 5ad38435d..7d9a462ea 100644 --- a/app/controllers/admin/poll/booth_assignments_controller.rb +++ b/app/controllers/admin/poll/booth_assignments_controller.rb @@ -25,8 +25,7 @@ class Admin::Poll::BoothAssignmentsController < Admin::Poll::BaseController def create @poll = Poll.find(booth_assignment_params[:poll_id]) @booth = Poll::Booth.find(booth_assignment_params[:booth_id]) - @booth_assignment = ::Poll::BoothAssignment.new(poll: @poll, - booth: @booth) + @booth_assignment = ::Poll::BoothAssignment.new(poll: @poll, booth: @booth) @booth_assignment.save! diff --git a/app/controllers/admin/site_customization/content_blocks_controller.rb b/app/controllers/admin/site_customization/content_blocks_controller.rb index a7420c5e7..4c759a6df 100644 --- a/app/controllers/admin/site_customization/content_blocks_controller.rb +++ b/app/controllers/admin/site_customization/content_blocks_controller.rb @@ -114,11 +114,7 @@ class Admin::SiteCustomization::ContentBlocksController < Admin::SiteCustomizati private def content_block_params - params.require(:site_customization_content_block).permit( - :name, - :locale, - :body - ) + params.require(:site_customization_content_block).permit(:name, :locale, :body) end def is_heading_content_block?(name) diff --git a/app/controllers/admin/site_customization/images_controller.rb b/app/controllers/admin/site_customization/images_controller.rb index c05647e29..3280c690d 100644 --- a/app/controllers/admin/site_customization/images_controller.rb +++ b/app/controllers/admin/site_customization/images_controller.rb @@ -39,8 +39,6 @@ class Admin::SiteCustomization::ImagesController < Admin::SiteCustomization::Bas private def image_params - params.require(:site_customization_image).permit( - :image - ) + params.require(:site_customization_image).permit(:image) end end diff --git a/app/controllers/admin/site_customization/information_texts_controller.rb b/app/controllers/admin/site_customization/information_texts_controller.rb index fc8a2b834..22f36ca15 100644 --- a/app/controllers/admin/site_customization/information_texts_controller.rb +++ b/app/controllers/admin/site_customization/information_texts_controller.rb @@ -41,8 +41,7 @@ class Admin::SiteCustomization::InformationTextsController < Admin::SiteCustomiz end def delete_translations - languages_to_delete = params[:enabled_translations].select { |_, v| v == "0" } - .keys + languages_to_delete = params[:enabled_translations].select { |_, v| v == "0" }.keys languages_to_delete.each do |locale| I18nContentTranslation.where(locale: locale).destroy_all @@ -56,8 +55,6 @@ class Admin::SiteCustomization::InformationTextsController < Admin::SiteCustomiz end def enabled_translations - params.fetch(:enabled_translations, {}) - .select { |_, v| v == "1" } - .keys + params.fetch(:enabled_translations, {}).select { |_, v| v == "1" }.keys end end diff --git a/app/controllers/admin/valuators_controller.rb b/app/controllers/admin/valuators_controller.rb index e00e16cd4..b3756d548 100644 --- a/app/controllers/admin/valuators_controller.rb +++ b/app/controllers/admin/valuators_controller.rb @@ -10,9 +10,7 @@ class Admin::ValuatorsController < Admin::BaseController end def search - @users = User.search(params[:search]) - .includes(:valuator) - .page(params[:page]) + @users = User.search(params[:search]).includes(:valuator).page(params[:page]) end def create diff --git a/app/controllers/installation_controller.rb b/app/controllers/installation_controller.rb index 6b7ac631d..91292e1e7 100644 --- a/app/controllers/installation_controller.rb +++ b/app/controllers/installation_controller.rb @@ -10,9 +10,7 @@ class InstallationController < ApplicationController private def consul_installation_details - { - release: "1.3.1" - }.merge(features: settings_feature_flags) + { release: "1.3.1" }.merge(features: settings_feature_flags) end def settings_feature_flags diff --git a/app/controllers/legislation/answers_controller.rb b/app/controllers/legislation/answers_controller.rb index 586769a1f..21a23761a 100644 --- a/app/controllers/legislation/answers_controller.rb +++ b/app/controllers/legislation/answers_controller.rb @@ -29,9 +29,7 @@ class Legislation::AnswersController < Legislation::BaseController private def answer_params - params.require(:legislation_answer).permit( - :legislation_question_option_id - ) + params.require(:legislation_answer).permit(:legislation_question_option_id) end def track_event diff --git a/app/controllers/valuation/budgets_controller.rb b/app/controllers/valuation/budgets_controller.rb index 338cccec4..0165fb0e2 100644 --- a/app/controllers/valuation/budgets_controller.rb +++ b/app/controllers/valuation/budgets_controller.rb @@ -7,9 +7,7 @@ class Valuation::BudgetsController < Valuation::BaseController def index @budget = current_budget if @budget.present? - @investments = @budget.investments - .by_valuator(current_user.valuator) - .valuation_open + @investments = @budget.investments.by_valuator(current_user.valuator).valuation_open end end end diff --git a/app/helpers/followables_helper.rb b/app/helpers/followables_helper.rb index 52a90f156..b302c3f55 100644 --- a/app/helpers/followables_helper.rb +++ b/app/helpers/followables_helper.rb @@ -4,10 +4,7 @@ module FollowablesHelper end def followable_icon(followable) - { - proposals: "Proposal", - budget: "Budget::Investment" - }.invert[followable] + { proposals: "Proposal", budget: "Budget::Investment" }.invert[followable] end def render_follow(follow) diff --git a/app/helpers/images_helper.rb b/app/helpers/images_helper.rb index 5f992a6b5..0935274e0 100644 --- a/app/helpers/images_helper.rb +++ b/app/helpers/images_helper.rb @@ -15,8 +15,6 @@ module ImagesHelper def render_image(image, version, show_caption = true) version = image.persisted? ? version : :original - render "images/image", image: image, - version: version, - show_caption: show_caption + render "images/image", image: image, version: version, show_caption: show_caption end end diff --git a/app/helpers/site_customization_helper.rb b/app/helpers/site_customization_helper.rb index 8d30e01cc..bd2824021 100644 --- a/app/helpers/site_customization_helper.rb +++ b/app/helpers/site_customization_helper.rb @@ -9,10 +9,7 @@ module SiteCustomizationHelper def translation_for_locale(content, locale) if content.present? - I18nContentTranslation.find_by( - i18n_content_id: content.id, - locale: locale - )&.value + I18nContentTranslation.find_by(i18n_content_id: content.id, locale: locale)&.value else false end diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb index d0b403f33..13ffaf18d 100644 --- a/app/models/budget/investment.rb +++ b/app/models/budget/investment.rb @@ -292,8 +292,7 @@ class Budget end def valid_heading?(user) - voted_in?(heading, user) || - can_vote_in_another_heading?(user) + voted_in?(heading, user) || can_vote_in_another_heading?(user) end def can_vote_in_another_heading?(user) diff --git a/app/models/budget/reclassification.rb b/app/models/budget/reclassification.rb index 798fb7ad4..09ddbd90f 100644 --- a/app/models/budget/reclassification.rb +++ b/app/models/budget/reclassification.rb @@ -31,9 +31,7 @@ class Budget def store_reclassified_votes(reason) ballot_lines_for_investment.order(:id).each do |line| - attrs = { user: line.ballot.user, - investment: self, - reason: reason } + attrs = { user: line.ballot.user, investment: self, reason: reason } Budget::ReclassifiedVote.create!(attrs) end end diff --git a/app/models/dashboard/action.rb b/app/models/dashboard/action.rb index f3734c0d0..a669990ce 100644 --- a/app/models/dashboard/action.rb +++ b/app/models/dashboard/action.rb @@ -11,10 +11,7 @@ class Dashboard::Action < ApplicationRecord enum action_type: [:proposed_action, :resource] - validates :title, - presence: true, - allow_blank: false, - length: { in: 4..80 } + validates :title, presence: true, allow_blank: false, length: { in: 4..80 } validates :action_type, presence: true diff --git a/app/models/organization.rb b/app/models/organization.rb index abda49873..62b510a4d 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -24,13 +24,11 @@ class Organization < ApplicationRecord end def verified? - verified_at.present? && - (rejected_at.blank? || rejected_at < verified_at) + verified_at.present? && (rejected_at.blank? || rejected_at < verified_at) end def rejected? - rejected_at.present? && - (verified_at.blank? || verified_at < rejected_at) + rejected_at.present? && (verified_at.blank? || verified_at < rejected_at) end def self.search(text) diff --git a/app/models/poll.rb b/app/models/poll.rb index ac9fd07fc..a8f2b6810 100644 --- a/app/models/poll.rb +++ b/app/models/poll.rb @@ -106,15 +106,13 @@ class Poll < ApplicationRecord end def self.votable_by(user) - answerable_by(user). - not_voted_by(user) + answerable_by(user).not_voted_by(user) end def votable_by?(user) return false if user_has_an_online_ballot?(user) - answerable_by?(user) && - not_voted_by?(user) + answerable_by?(user) && not_voted_by?(user) end def user_has_an_online_ballot?(user) diff --git a/app/models/related_content_score.rb b/app/models/related_content_score.rb index 3d7684545..e557a5375 100644 --- a/app/models/related_content_score.rb +++ b/app/models/related_content_score.rb @@ -1,8 +1,5 @@ class RelatedContentScore < ApplicationRecord - SCORES = { - POSITIVE: 1, - NEGATIVE: -1 - }.freeze + SCORES = { POSITIVE: 1, NEGATIVE: -1 }.freeze belongs_to :related_content, touch: true, counter_cache: :related_content_scores_count belongs_to :user diff --git a/app/models/verification/letter.rb b/app/models/verification/letter.rb index faee0196d..24517afa8 100644 --- a/app/models/verification/letter.rb +++ b/app/models/verification/letter.rb @@ -12,8 +12,7 @@ class Verification::Letter validate :validate_correct_code, if: :verify? def save - valid? && - letter_requested! + valid? && letter_requested! end def save! diff --git a/config/environments/test.rb b/config/environments/test.rb index 6ebbecbfc..14aab67dd 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -38,9 +38,7 @@ Rails.application.configure do # The :test delivery method accumulates sent emails in the # ActionMailer::Base.deliveries array. config.action_mailer.delivery_method = :test - config.action_mailer.default_url_options = { - host: "test" - } + config.action_mailer.default_url_options = { host: "test" } config.action_mailer.asset_host = "http://consul.test" # Print deprecation notices to the stderr. diff --git a/lib/active_model/dates.rb b/lib/active_model/dates.rb index 29b296fc5..9defc62a9 100644 --- a/lib/active_model/dates.rb +++ b/lib/active_model/dates.rb @@ -1,8 +1,6 @@ module ActiveModel::Dates def parse_date(field, attrs) - year, month, day = attrs["#{field}(1i)"], - attrs["#{field}(2i)"], - attrs["#{field}(3i)"] + year, month, day = attrs["#{field}(1i)"], attrs["#{field}(2i)"], attrs["#{field}(3i)"] return nil unless day.present? && month.present? && year.present? diff --git a/lib/tasks/proposal_actions.rake b/lib/tasks/proposal_actions.rake index 033fe5ab1..9eb2818db 100644 --- a/lib/tasks/proposal_actions.rake +++ b/lib/tasks/proposal_actions.rake @@ -4,11 +4,7 @@ namespace :proposal_actions do ProposalDashboardAction.where.not(link: nil).each do |action| next if action.link.blank? - Link.create!( - label: action.title, - url: action.link, - linkable: action - ) + Link.create!(label: action.title, url: action.link, linkable: action) end end diff --git a/spec/components/admin/budgets/form_component_spec.rb b/spec/components/admin/budgets/form_component_spec.rb index 1abacdeee..66b0b6bd3 100644 --- a/spec/components/admin/budgets/form_component_spec.rb +++ b/spec/components/admin/budgets/form_component_spec.rb @@ -3,10 +3,7 @@ require "rails_helper" describe Admin::Budgets::FormComponent, type: :component do describe "#voting_styles_select_options" do it "provides vote kinds" do - types = [ - ["Knapsack", "knapsack"], - ["Approval", "approval"] - ] + types = [["Knapsack", "knapsack"], ["Approval", "approval"]] component = Admin::Budgets::FormComponent.new(double) diff --git a/spec/helpers/locales_helper_spec.rb b/spec/helpers/locales_helper_spec.rb index f908b6991..9224a3918 100644 --- a/spec/helpers/locales_helper_spec.rb +++ b/spec/helpers/locales_helper_spec.rb @@ -15,8 +15,7 @@ describe LocalesHelper do end it "returns the language name in i18n.language.name translation" do - keys = { language: { - name: "World Language" }} + keys = { language: { name: "World Language" }} I18n.backend.store_translations(:wl, { i18n: keys }) diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb index bde677915..0d8c5a0c2 100644 --- a/spec/i18n_spec.rb +++ b/spec/i18n_spec.rb @@ -22,9 +22,7 @@ describe "I18n" do end it "returns plural rule if translation present" do - keys = { zero: "No comments", - one: "1 comment", - other: "%{count} comments" } + keys = { zero: "No comments", one: "1 comment", other: "%{count} comments" } I18n.backend.store_translations(:en, { test_plural: keys }) @@ -34,9 +32,7 @@ describe "I18n" do end it "returns default locale's plural rule if whole translation not present" do - keys = { zero: "No comments", - one: "1 comment", - other: "%{count} comments" } + keys = { zero: "No comments", one: "1 comment", other: "%{count} comments" } I18n.backend.store_translations(I18n.default_locale, { test_plural: keys }) I18n.backend.store_translations(:zz, {}) diff --git a/spec/models/administrator_spec.rb b/spec/models/administrator_spec.rb index fdf061ed1..b2fbb5392 100644 --- a/spec/models/administrator_spec.rb +++ b/spec/models/administrator_spec.rb @@ -27,9 +27,7 @@ describe Administrator do let!(:user) { create(:user, username: "Billy Wilder", email: "test@test.com") } it "returns description and email if decription present" do - administrator = create(:administrator, - description: "John Doe", - user: user) + administrator = create(:administrator, description: "John Doe", user: user) expect(administrator.description_or_name_and_email).to eq("John Doe (test@test.com)") end diff --git a/spec/models/budget/investment_spec.rb b/spec/models/budget/investment_spec.rb index 905eebefb..854bb1d9c 100644 --- a/spec/models/budget/investment_spec.rb +++ b/spec/models/budget/investment_spec.rb @@ -430,9 +430,7 @@ describe Budget::Investment do describe "with without_admin filter" do let(:params) { { advanced_filters: ["without_admin"], budget_id: budget.id } } it "returns only investment without admin" do - create(:budget_investment, - :with_administrator, - budget: budget) + create(:budget_investment, :with_administrator, budget: budget) investment2 = create(:budget_investment, budget: budget) expect(Budget::Investment.scoped_filter(params, "all")).to eq([investment2]) @@ -442,14 +440,9 @@ describe Budget::Investment do describe "with without_valuator filter" do let(:params) { { advanced_filters: ["without_valuator"], budget_id: budget.id } } it "returns only investment without valuator" do - create(:budget_investment, - :with_valuator, - budget: budget) - investment2 = create(:budget_investment, - :with_administrator, - budget: budget) - investment3 = create(:budget_investment, - budget: budget) + create(:budget_investment, :with_valuator, budget: budget) + investment2 = create(:budget_investment, :with_administrator, budget: budget) + investment3 = create(:budget_investment, budget: budget) expect(Budget::Investment.scoped_filter(params, "all")) .to contain_exactly(investment2, investment3) @@ -471,14 +464,9 @@ describe Budget::Investment do describe "with valuation_finished filter" do let(:params) { { advanced_filters: ["valuation_finished"], budget_id: budget.id } } it "returns only investment with valuation finished" do - investment1 = create(:budget_investment, - :selected, - budget: budget) - create(:budget_investment, - :with_administrator, - budget: budget) - create(:budget_investment, - budget: budget) + investment1 = create(:budget_investment, :selected, budget: budget) + create(:budget_investment, :with_administrator, budget: budget) + create(:budget_investment, budget: budget) expect(Budget::Investment.scoped_filter(params, "all")).to eq([investment1]) end diff --git a/spec/models/comment_spec.rb b/spec/models/comment_spec.rb index a08cdb623..f52b099d9 100644 --- a/spec/models/comment_spec.rb +++ b/spec/models/comment_spec.rb @@ -85,13 +85,11 @@ describe Comment do let(:comment) { create(:comment) } it "expires cache when it has a new vote" do - expect { create(:vote, votable: comment) } - .to change { comment.cache_version } + expect { create(:vote, votable: comment) }.to change { comment.cache_version } end it "expires cache when hidden" do - expect { comment.hide } - .to change { comment.cache_version } + expect { comment.hide }.to change { comment.cache_version } end it "expires cache when the author is hidden" do diff --git a/spec/models/concerns/sluggable.rb b/spec/models/concerns/sluggable.rb index bdc43b284..b62a1ef41 100644 --- a/spec/models/concerns/sluggable.rb +++ b/spec/models/concerns/sluggable.rb @@ -21,8 +21,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(name: "New Name") } - .not_to change { sluggable.slug } + expect { sluggable.update(name: "New Name") }.not_to change { sluggable.slug } end end end diff --git a/spec/models/debate_spec.rb b/spec/models/debate_spec.rb index aab0e5bf8..4b5564955 100644 --- a/spec/models/debate_spec.rb +++ b/spec/models/debate_spec.rb @@ -355,28 +355,23 @@ describe Debate do let(:debate) { create(:debate) } it "expires cache when it has a new comment" do - expect { create(:comment, commentable: debate) } - .to change { debate.cache_version } + expect { create(:comment, commentable: debate) }.to change { debate.cache_version } end it "expires cache when it has a new vote" do - expect { create(:vote, votable: debate) } - .to change { debate.cache_version } + expect { create(:vote, votable: debate) }.to change { debate.cache_version } end it "expires cache when it has a new flag" do - expect { create(:flag, flaggable: debate) } - .to change { debate.reload.cache_version } + expect { create(:flag, flaggable: debate) }.to change { debate.reload.cache_version } end it "expires cache when it has a new tag" do - expect { debate.update(tag_list: "new tag") } - .to change { debate.cache_version } + expect { debate.update(tag_list: "new tag") }.to change { debate.cache_version } end it "expires cache when hidden" do - expect { debate.hide } - .to change { debate.cache_version } + expect { debate.hide }.to change { debate.cache_version } end it "expires cache when the author is hidden" do diff --git a/spec/models/i18n_content_spec.rb b/spec/models/i18n_content_spec.rb index 1a238cc61..99b115440 100644 --- a/spec/models/i18n_content_spec.rb +++ b/spec/models/i18n_content_spec.rb @@ -45,39 +45,17 @@ RSpec.describe I18nContent, type: :model do describe "#flat_hash" do it "uses one parameter" do - expect(I18nContent.flat_hash(nil)).to eq({ - nil => nil - }) - - expect(I18nContent.flat_hash("string")).to eq({ - nil => "string" - }) - - expect(I18nContent.flat_hash({ w: "string" })).to eq({ - "w" => "string" - }) - - expect(I18nContent.flat_hash({ w: { p: "string" }})).to eq({ - "w.p" => "string" - }) + expect(I18nContent.flat_hash(nil)).to eq({ nil => nil }) + expect(I18nContent.flat_hash("string")).to eq({ nil => "string" }) + expect(I18nContent.flat_hash({ w: "string" })).to eq({ "w" => "string" }) + expect(I18nContent.flat_hash({ w: { p: "string" }})).to eq({ "w.p" => "string" }) end it "uses the first two parameters" do - expect(I18nContent.flat_hash("string", "f")).to eq({ - "f" => "string" - }) - - expect(I18nContent.flat_hash(nil, "f")).to eq({ - "f" => nil - }) - - expect(I18nContent.flat_hash({ w: "string" }, "f")).to eq({ - "f.w" => "string" - }) - - expect(I18nContent.flat_hash({ w: { p: "string" }}, "f")).to eq({ - "f.w.p" => "string" - }) + expect(I18nContent.flat_hash("string", "f")).to eq({ "f" => "string" }) + expect(I18nContent.flat_hash(nil, "f")).to eq({ "f" => nil }) + expect(I18nContent.flat_hash({ w: "string" }, "f")).to eq({ "f.w" => "string" }) + expect(I18nContent.flat_hash({ w: { p: "string" }}, "f")).to eq({ "f.w.p" => "string" }) end it "uses the first and last parameters" do diff --git a/spec/models/poll/poll_spec.rb b/spec/models/poll/poll_spec.rb index 90f3a8b0c..329cbd64e 100644 --- a/spec/models/poll/poll_spec.rb +++ b/spec/models/poll/poll_spec.rb @@ -194,8 +194,7 @@ describe Poll do end it "returns restricted & unrestricted polls for level 2 users of the correct geozone" do - list = Poll.answerable_by(level2_from_geozone) - .order(:geozone_restricted) + list = Poll.answerable_by(level2_from_geozone).order(:geozone_restricted) expect(list.to_a).to eq([current_poll, current_restricted_poll]) end end diff --git a/spec/models/proposal_spec.rb b/spec/models/proposal_spec.rb index f1f06e96b..25bbdaed0 100644 --- a/spec/models/proposal_spec.rb +++ b/spec/models/proposal_spec.rb @@ -385,28 +385,23 @@ describe Proposal do let(:proposal) { create(:proposal) } it "expires cache when it has a new comment" do - expect { create(:comment, commentable: proposal) } - .to change { proposal.cache_version } + expect { create(:comment, commentable: proposal) }.to change { proposal.cache_version } end it "expires cache when it has a new vote" do - expect { create(:vote, votable: proposal) } - .to change { proposal.cache_version } + expect { create(:vote, votable: proposal) }.to change { proposal.cache_version } end it "expires cache when it has a new flag" do - expect { create(:flag, flaggable: proposal) } - .to change { proposal.reload.cache_version } + expect { create(:flag, flaggable: proposal) }.to change { proposal.reload.cache_version } end it "expires cache when it has a new tag" do - expect { proposal.update(tag_list: "new tag") } - .to change { proposal.cache_version } + expect { proposal.update(tag_list: "new tag") }.to change { proposal.cache_version } end it "expires cache when hidden" do - expect { proposal.hide } - .to change { proposal.cache_version } + expect { proposal.hide }.to change { proposal.cache_version } end it "expires cache when the author is hidden" do diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 262f08063..3c6103c44 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -483,19 +483,16 @@ describe User do let(:user) { create(:user) } it "expires cache with becoming a moderator" do - expect { create(:moderator, user: user) } - .to change { user.cache_version } + expect { create(:moderator, user: user) }.to change { user.cache_version } end it "expires cache with becoming an admin" do - expect { create(:administrator, user: user) } - .to change { user.cache_version } + expect { create(:administrator, user: user) }.to change { user.cache_version } end it "expires cache with becoming a veridied organization" do create(:organization, user: user) - expect { user.organization.verify } - .to change { user.reload.cache_version } + expect { user.organization.verify }.to change { user.reload.cache_version } end end @@ -546,9 +543,7 @@ describe User do end it "maintains associated identification document" do - user = create(:user, - document_number: "1234", - document_type: "1") + user = create(:user, document_number: "1234", document_type: "1") user.erase user.reload @@ -711,10 +706,7 @@ describe User do end it "is false for verified users with no email" do - user = create(:user, - username: "Lois", - email: "", - verified_at: Time.current) + user = create(:user, username: "Lois", email: "", verified_at: Time.current) expect(user).to be_valid expect(user.email_required?).to eq(false) diff --git a/spec/system/admin/budget_investments_spec.rb b/spec/system/admin/budget_investments_spec.rb index 3782dd530..245877c89 100644 --- a/spec/system/admin/budget_investments_spec.rb +++ b/spec/system/admin/budget_investments_spec.rb @@ -6,9 +6,7 @@ describe "Admin budget investments", :admin do create(:administrator, user: create(:user, username: "Ana", email: "ana@admins.org")) end - it_behaves_like "admin_milestoneable", - :budget_investment, - "admin_polymorphic_path" + it_behaves_like "admin_milestoneable", :budget_investment, "admin_polymorphic_path" context "Load" do let!(:investment) { create(:budget_investment, budget: budget) } @@ -240,13 +238,8 @@ describe "Admin budget investments", :admin do end scenario "Filtering by without assigned admin" do - create(:budget_investment, - title: "Investment without admin", - budget: budget) - create(:budget_investment, - :with_administrator, - title: "Investment with admin", - budget: budget) + create(:budget_investment, title: "Investment without admin", budget: budget) + create(:budget_investment, :with_administrator, title: "Investment with admin", budget: budget) visit admin_budget_budget_investments_path(budget_id: budget) expect(page).to have_link("Investment without admin") @@ -334,13 +327,8 @@ describe "Admin budget investments", :admin do end scenario "Filtering by valuation finished" do - create(:budget_investment, - title: "Investment valuation open", - budget: budget) - create(:budget_investment, - :finished, - title: "Investment valuation finished", - budget: budget) + create(:budget_investment, title: "Investment valuation open", budget: budget) + create(:budget_investment, :finished, title: "Investment valuation finished", budget: budget) visit admin_budget_budget_investments_path(budget_id: budget) expect(page).to have_link("Investment valuation open") @@ -363,14 +351,8 @@ describe "Admin budget investments", :admin do end scenario "Filtering by winners" do - create(:budget_investment, - :winner, - :finished, - title: "Investment winner", - budget: budget) - create(:budget_investment, - title: "Investment without winner", - budget: budget) + create(:budget_investment, :winner, :finished, title: "Investment winner", budget: budget) + create(:budget_investment, title: "Investment without winner", budget: budget) visit admin_budget_budget_investments_path(budget_id: budget) expect(page).to have_link("Investment winner") diff --git a/spec/system/admin/proposals_spec.rb b/spec/system/admin/proposals_spec.rb index 07084823b..473470c67 100644 --- a/spec/system/admin/proposals_spec.rb +++ b/spec/system/admin/proposals_spec.rb @@ -1,9 +1,7 @@ require "rails_helper" describe "Admin proposals", :admin do - it_behaves_like "admin_milestoneable", - :proposal, - "admin_polymorphic_path" + it_behaves_like "admin_milestoneable", :proposal, "admin_polymorphic_path" context "Index" do scenario "Search" do diff --git a/spec/system/debates_spec.rb b/spec/system/debates_spec.rb index 2d0e2868f..c91895ff4 100644 --- a/spec/system/debates_spec.rb +++ b/spec/system/debates_spec.rb @@ -4,14 +4,8 @@ describe "Debates" do context "Concerns" do it_behaves_like "notifiable in-app", :debate it_behaves_like "relationable", Debate - it_behaves_like "remotely_translatable", - :debate, - "debates_path", - {} - it_behaves_like "remotely_translatable", - :debate, - "debate_path", - { id: "id" } + it_behaves_like "remotely_translatable", :debate, "debates_path", {} + it_behaves_like "remotely_translatable", :debate, "debate_path", { id: "id" } it_behaves_like "flaggable", :debate end diff --git a/spec/system/polls/polls_spec.rb b/spec/system/polls/polls_spec.rb index 77aaf288e..e0d175db1 100644 --- a/spec/system/polls/polls_spec.rb +++ b/spec/system/polls/polls_spec.rb @@ -129,8 +129,7 @@ describe "Polls" do Setting["feature.sdg"] = true Setting["sdg.process.polls"] = true - create(:poll, sdg_goals: [SDG::Goal[1]], - sdg_targets: [SDG::Target["1.1"]]) + create(:poll, sdg_goals: [SDG::Goal[1]], sdg_targets: [SDG::Target["1.1"]]) visit polls_path @@ -414,8 +413,7 @@ describe "Polls" do Setting["feature.sdg"] = true Setting["sdg.process.polls"] = true - poll = create(:poll, sdg_goals: [SDG::Goal[1]], - sdg_targets: [SDG::Target["1.1"]]) + poll = create(:poll, sdg_goals: [SDG::Goal[1]], sdg_targets: [SDG::Target["1.1"]]) visit poll_path(poll) diff --git a/spec/system/proposals_spec.rb b/spec/system/proposals_spec.rb index 989caf158..f8466c79c 100644 --- a/spec/system/proposals_spec.rb +++ b/spec/system/proposals_spec.rb @@ -6,14 +6,8 @@ describe "Proposals" do context "Concerns" do it_behaves_like "notifiable in-app", :proposal it_behaves_like "relationable", Proposal - it_behaves_like "remotely_translatable", - :proposal, - "proposals_path", - {} - it_behaves_like "remotely_translatable", - :proposal, - "proposal_path", - { id: "id" } + it_behaves_like "remotely_translatable", :proposal, "proposals_path", {} + it_behaves_like "remotely_translatable", :proposal, "proposal_path", { id: "id" } it_behaves_like "flaggable", :proposal end diff --git a/spec/system/verification/verified_user_spec.rb b/spec/system/verification/verified_user_spec.rb index bf6652593..19503f402 100644 --- a/spec/system/verification/verified_user_spec.rb +++ b/spec/system/verification/verified_user_spec.rb @@ -2,21 +2,11 @@ require "rails_helper" describe "Verified users" do scenario "Verified emails" do - user = create(:user, - residence_verified_at: Time.current, - document_number: "12345678Z") + user = create(:user, residence_verified_at: Time.current, document_number: "12345678Z") - create(:verified_user, - document_number: "12345678Z", - email: "rock@example.com") - - create(:verified_user, - document_number: "12345678Z", - email: "roll@example.com") - - create(:verified_user, - document_number: "99999999R", - email: "another@example.com") + create(:verified_user, document_number: "12345678Z", email: "rock@example.com") + create(:verified_user, document_number: "12345678Z", email: "roll@example.com") + create(:verified_user, document_number: "99999999R", email: "another@example.com") login_as(user) visit verified_user_path @@ -27,21 +17,11 @@ describe "Verified users" do end scenario "Verified phones" do - user = create(:user, - residence_verified_at: Time.current, - document_number: "12345678Z") + user = create(:user, residence_verified_at: Time.current, document_number: "12345678Z") - create(:verified_user, - document_number: "12345678Z", - phone: "611111111") - - create(:verified_user, - document_number: "12345678Z", - phone: "622222222") - - create(:verified_user, - document_number: "99999999R", - phone: "633333333") + create(:verified_user, document_number: "12345678Z", phone: "611111111") + create(:verified_user, document_number: "12345678Z", phone: "622222222") + create(:verified_user, document_number: "99999999R", phone: "633333333") login_as(user) visit verified_user_path @@ -52,15 +32,10 @@ describe "Verified users" do end scenario "No emails or phones" do - user = create(:user, - residence_verified_at: Time.current, - document_number: "12345678Z") + user = create(:user, residence_verified_at: Time.current, document_number: "12345678Z") - create(:verified_user, - document_number: "12345678Z") - - create(:verified_user, - document_number: "12345678Z") + create(:verified_user, document_number: "12345678Z") + create(:verified_user, document_number: "12345678Z") login_as(user) visit verified_user_path @@ -69,13 +44,8 @@ describe "Verified users" do end scenario "Select a verified email" do - user = create(:user, - residence_verified_at: Time.current, - document_number: "12345678Z") - - verified_user = create(:verified_user, - document_number: "12345678Z", - email: "rock@example.com") + user = create(:user, residence_verified_at: Time.current, document_number: "12345678Z") + verified_user = create(:verified_user, document_number: "12345678Z", email: "rock@example.com") login_as(user) visit verified_user_path @@ -89,13 +59,8 @@ describe "Verified users" do end scenario "Select a verified phone" do - user = create(:user, - residence_verified_at: Time.current, - document_number: "12345678Z") - - verified_user = create(:verified_user, - document_number: "12345678Z", - phone: "611111111") + user = create(:user, residence_verified_at: Time.current, document_number: "12345678Z") + verified_user = create(:verified_user, document_number: "12345678Z", phone: "611111111") login_as(user) visit verified_user_path @@ -108,13 +73,9 @@ describe "Verified users" do end scenario "Continue without selecting any verified information" do - user = create(:user, - residence_verified_at: Time.current, - document_number: "12345678Z") + user = create(:user, residence_verified_at: Time.current, document_number: "12345678Z") - create(:verified_user, - document_number: "12345678Z", - phone: "611111111") + create(:verified_user, document_number: "12345678Z", phone: "611111111") login_as(user) visit verified_user_path diff --git a/spec/system/welcome_spec.rb b/spec/system/welcome_spec.rb index 648927efb..79d4b1af5 100644 --- a/spec/system/welcome_spec.rb +++ b/spec/system/welcome_spec.rb @@ -3,20 +3,9 @@ require "rails_helper" describe "Welcome screen" do let(:budget) { create(:budget) } - it_behaves_like "remotely_translatable", - :proposal, - "root_path", - {} - - it_behaves_like "remotely_translatable", - :debate, - "root_path", - {} - - it_behaves_like "remotely_translatable", - :legislation_process, - "root_path", - {} + it_behaves_like "remotely_translatable", :proposal, "root_path", {} + it_behaves_like "remotely_translatable", :debate, "root_path", {} + it_behaves_like "remotely_translatable", :legislation_process, "root_path", {} scenario "requires a logged in user" do visit welcome_path