diff --git a/.rubocop.yml b/.rubocop.yml index dc61db8c8..828a5227d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -354,6 +354,14 @@ Naming/BlockForwarding: - "app/controllers/management/base_controller.rb" - "app/controllers/subscriptions_controller.rb" +Naming/PredicateMethod: + Enabled: true + Exclude: + - "app/models/local_census_records/import.rb" + - "app/models/user.rb" + - "app/models/verification/management/email.rb" + - "config/initializers/foundation_form_builder.rb" + Naming/RescuedExceptionsVariableName: Enabled: true diff --git a/app/components/sdg/goals/help_page_component.html.erb b/app/components/sdg/goals/help_page_component.html.erb index af052dd8b..0946cbdc3 100644 --- a/app/components/sdg/goals/help_page_component.html.erb +++ b/app/components/sdg/goals/help_page_component.html.erb @@ -9,7 +9,7 @@
<%= t("sdg.goals.help.description") %>
<%= sanitize t("sdg.goals.goal_#{goal.code}.description") %>
<%= render SDG::Goals::TargetsComponent.new(goal) %> diff --git a/app/components/sdg/goals/help_page_component.rb b/app/components/sdg/goals/help_page_component.rb index 470bdf5e6..8f9cd2c9c 100644 --- a/app/components/sdg/goals/help_page_component.rb +++ b/app/components/sdg/goals/help_page_component.rb @@ -11,7 +11,7 @@ class SDG::Goals::HelpPageComponent < ApplicationComponent private - def is_active?(goal) + def active_class(goal) "is-active" if goal.code == 1 end end diff --git a/app/components/shared/vote_button_component.rb b/app/components/shared/vote_button_component.rb index 1907c1d6d..a52396a9a 100644 --- a/app/components/shared/vote_button_component.rb +++ b/app/components/shared/vote_button_component.rb @@ -35,14 +35,14 @@ class Shared::VoteButtonComponent < ApplicationComponent end def vote - @vote ||= Vote.find_or_initialize_by(votable: votable, voter: current_user, vote_flag: parsed_value) + @vote ||= Vote.find_or_initialize_by(votable: votable, voter: current_user, vote_flag: in_favor?) end def already_voted? vote.persisted? end - def parsed_value + def in_favor? value == "yes" end end diff --git a/app/helpers/proposals_dashboard_helper.rb b/app/helpers/proposals_dashboard_helper.rb index 3b069cd02..f7144320a 100644 --- a/app/helpers/proposals_dashboard_helper.rb +++ b/app/helpers/proposals_dashboard_helper.rb @@ -52,7 +52,7 @@ module ProposalsDashboardHelper dashboard_action&.proposed_action? end - def is_request_active(id) + def request_active?(id) controller_name == "dashboard" && action_name == "new_request" && dashboard_action&.id == id end diff --git a/app/views/dashboard/_menu.html.erb b/app/views/dashboard/_menu.html.erb index f43835c5a..e4b555861 100644 --- a/app/views/dashboard/_menu.html.erb +++ b/app/views/dashboard/_menu.html.erb @@ -72,7 +72,7 @@ <% resources.each do |resource| %>