From 6cb11ff2f3dc02dd30dbbaadbe4f94d4ad63a123 Mon Sep 17 00:00:00 2001 From: nasia Date: Sat, 3 Jun 2017 13:48:49 +0300 Subject: [PATCH] Add Style/WordArray at rubocop.yml #1463 --- .rubocop.yml | 4 ++++ .rubocop_todo.yml | 8 -------- app/models/event_user.rb | 2 +- lib/tasks/version.rake | 2 +- spec/helpers/users_helper_spec.rb | 2 +- spec/models/user_spec.rb | 2 +- 6 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index c333e43a..de234a2a 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -104,6 +104,10 @@ Style/TrailingBlankLines: Style/TrailingWhitespace: Enabled: true +# Check for array literals made up of word-like strings, that are not using the %w() syntax +Style/WordArray: + Enabled: true + # This cop checks for numeric comparisons that can be replaced by a predicate method. Style/ZeroLengthPredicate: Enabled: true diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index bc17a090..a7ea415b 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -928,11 +928,3 @@ Style/UnneededInterpolation: Style/VariableNumber: Exclude: - 'spec/models/ticket_purchase_spec.rb' - -# Offense count: 6 -# Cop supports --auto-correct. -# Configuration parameters: SupportedStyles, WordRegex. -# SupportedStyles: percent, brackets -Style/WordArray: - EnforcedStyle: percent - MinSize: 3 diff --git a/app/models/event_user.rb b/app/models/event_user.rb index 64952a28..58adadad 100644 --- a/app/models/event_user.rb +++ b/app/models/event_user.rb @@ -1,6 +1,6 @@ class EventUser < ActiveRecord::Base # TODO Do we need these roles? - ROLES = [['Speaker', 'speaker'], ['Submitter', 'submitter'], ['Moderator', 'moderator']] + ROLES = [%w[Speaker speaker], %w[Submitter submitter], %w[Moderator moderator]] belongs_to :event belongs_to :user diff --git a/lib/tasks/version.rake b/lib/tasks/version.rake index 084ff181..e4005c15 100644 --- a/lib/tasks/version.rake +++ b/lib/tasks/version.rake @@ -2,7 +2,7 @@ namespace :data do desc 'Sets conference_id in all pre-existing PaperTrail::Version objects' task set_conference_in_versions: :environment do - PaperTrail::Version.where(conference_id: nil, item_type: ['Conference', 'Event']).each do |version| + PaperTrail::Version.where(conference_id: nil, item_type: %w[Conference Event]).each do |version| # All pre-existing versions are either of Conference or Event if version.item_type == 'Conference' version.update_attributes(conference_id: version.item_id) diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb index dfc337e6..e0c2d3fd 100644 --- a/spec/helpers/users_helper_spec.rb +++ b/spec/helpers/users_helper_spec.rb @@ -4,7 +4,7 @@ describe UsersHelper, type: :helper do describe 'show_roles' do it 'formats the hash passed' do - roles = { 'organizer' => ['oSC16', 'oSC15'], 'cfp' => ['oSC16'] } + roles = { 'organizer' => %w[oSC16 oSC15], 'cfp' => ['oSC16'] } expect(show_roles(roles)).to eq 'Organizer (oSC16, oSC15), Cfp (oSC16)' end end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index d0517212..e742b993 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -282,7 +282,7 @@ describe User do it 'returns hash of role and conference' do expected_hash = { - 'organizer' => ['oSC16', 'oSC15'], + 'organizer' => %w[oSC16 oSC15], 'cfp' => ['oSC16'] }