From 8e5d65dc3cecdad8f4bb56c6f1d3cb690e62378a Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 21 Nov 2023 19:09:01 -0500 Subject: [PATCH] Ignore Style/WordArray in languages_helper --- .rubocop_todo.yml | 7 ------- app/helpers/languages_helper.rb | 3 +++ app/models/concerns/attachmentable.rb | 2 +- spec/models/user_spec.rb | 2 +- spec/requests/api/v1/apps_spec.rb | 2 +- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 357ed995450..2cabe42d188 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -108,10 +108,3 @@ Style/RedundantConstantBase: Exclude: - 'config/environments/production.rb' - 'config/initializers/sidekiq.rb' - -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: WordRegex. -# SupportedStyles: percent, brackets -Style/WordArray: - EnforcedStyle: percent - MinSize: 3 diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb index 9e1c0a7db1d..854c213350e 100644 --- a/app/helpers/languages_helper.rb +++ b/app/helpers/languages_helper.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true module LanguagesHelper + # rubocop:disable Style/WordArray ISO_639_1 = { aa: ['Afar', 'Afaraf'].freeze, ab: ['Abkhaz', 'аҧсуа бызшәа'].freeze, @@ -221,6 +222,8 @@ module LanguagesHelper 'zh-YUE': ['Cantonese', '廣東話'].freeze, }.freeze + # rubocop:enable Style/WordArray + SUPPORTED_LOCALES = {}.merge(ISO_639_1).merge(ISO_639_1_REGIONAL).merge(ISO_639_3).freeze # For ISO-639-1 and ISO-639-3 language codes, we have their official diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb index a83e178fc4f..89c910249af 100644 --- a/app/models/concerns/attachmentable.rb +++ b/app/models/concerns/attachmentable.rb @@ -69,7 +69,7 @@ module Attachmentable original_extension = Paperclip::Interpolations.extension(attachment, :original) proper_extension = extensions_for_mime_type.first.to_s extension = extensions_for_mime_type.include?(original_extension) ? original_extension : proper_extension - extension = 'jpeg' if ['jpe', 'jfif'].include?(extension) + extension = 'jpeg' if %w(jpe jfif).include?(extension) extension end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 4755500fc4e..de04d4e2e42 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -90,7 +90,7 @@ RSpec.describe User do it 'preserves valid options for languages' do user = Fabricate.build(:user, chosen_languages: ['en', 'fr', '']) - expect(user.chosen_languages).to eq(['en', 'fr']) + expect(user.chosen_languages).to eq(%w(en fr)) end it 'cleans out empty string from languages' do diff --git a/spec/requests/api/v1/apps_spec.rb b/spec/requests/api/v1/apps_spec.rb index 1f01bddf3ca..29630f932ac 100644 --- a/spec/requests/api/v1/apps_spec.rb +++ b/spec/requests/api/v1/apps_spec.rb @@ -42,7 +42,7 @@ RSpec.describe 'Apps' do client_secret: app.secret, name: client_name, website: website, - scopes: ['read', 'write'], + scopes: %w(read write), redirect_uris: redirect_uris, # Deprecated properties as of 4.3: redirect_uri: redirect_uri,