summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Jankowski <matt@jankowski.online>2023-11-08 08:03:44 -0500
committerGitHub <noreply@github.com>2023-11-08 13:03:44 +0000
commitce91d14d48e897a9586e126364e9c3df3f9e2880 (patch)
treecddf3e00848454bb930a6c30be37a8946e55902e
parentc03bd2a238741a012aa4b98dc4902d6cf948ab63 (diff)
Fix `Style/WordArray` cop (#27770)
-rw-r--r--.rubocop_todo.yml2
-rw-r--r--spec/controllers/settings/imports_controller_spec.rb2
-rw-r--r--spec/models/form/import_spec.rb2
3 files changed, 2 insertions, 4 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 36d543b133f..4d753a71a08 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -616,5 +616,3 @@ Style/TrailingCommaInHashLiteral:
Style/WordArray:
Exclude:
- 'app/helpers/languages_helper.rb'
- - 'spec/controllers/settings/imports_controller_spec.rb'
- - 'spec/models/form/import_spec.rb'
diff --git a/spec/controllers/settings/imports_controller_spec.rb b/spec/controllers/settings/imports_controller_spec.rb
index 35d2f081939..900d0eb90dc 100644
--- a/spec/controllers/settings/imports_controller_spec.rb
+++ b/spec/controllers/settings/imports_controller_spec.rb
@@ -194,7 +194,7 @@ RSpec.describe Settings::ImportsController do
let!(:rows) do
[
{ 'acct' => 'foo@bar' },
- { 'acct' => 'user@bar', 'show_reblogs' => false, 'notify' => true, 'languages' => ['fr', 'de'] },
+ { 'acct' => 'user@bar', 'show_reblogs' => false, 'notify' => true, 'languages' => %w(fr de) },
].map { |data| Fabricate(:bulk_import_row, bulk_import: bulk_import, data: data) }
end
diff --git a/spec/models/form/import_spec.rb b/spec/models/form/import_spec.rb
index 2b70e396b9f..872697485ed 100644
--- a/spec/models/form/import_spec.rb
+++ b/spec/models/form/import_spec.rb
@@ -296,7 +296,7 @@ RSpec.describe Form::Import do
it_behaves_like 'on successful import', 'following', 'merge', 'following_accounts.csv', [
{ 'acct' => 'user@example.com', 'show_reblogs' => true, 'notify' => false, 'languages' => nil },
- { 'acct' => 'user@test.com', 'show_reblogs' => true, 'notify' => true, 'languages' => ['en', 'fr'] },
+ { 'acct' => 'user@test.com', 'show_reblogs' => true, 'notify' => true, 'languages' => %w(en fr) },
]
it_behaves_like 'on successful import', 'muting', 'merge', 'muted_accounts.csv', [