tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Style/WordArray cop (#27770)

Browse Source
This commit is contained in:
Matt Jankowski 2023-11-08 08:03:44 -05:00 committed by GitHub
parent c03bd2a238
commit ce91d14d48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.rubocop_todo.yml
View File

@ -616,5 +616,3 @@ Style/TrailingCommaInHashLiteral:
Style/WordArray: Style/WordArray:
Exclude: Exclude:
- 'app/helpers/languages_helper.rb' - 'app/helpers/languages_helper.rb'
- 'spec/controllers/settings/imports_controller_spec.rb'
- 'spec/models/form/import_spec.rb'

2
spec/controllers/settings/imports_controller_spec.rb
View File

@ -194,7 +194,7 @@ RSpec.describe Settings::ImportsController do
let!(:rows) do let!(:rows) do
[ [
{ 'acct' => 'foo@bar' }, { '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) } ].map { |data| Fabricate(:bulk_import_row, bulk_import: bulk_import, data: data) }
end end

2
spec/models/form/import_spec.rb
View File

@ -296,7 +296,7 @@ RSpec.describe Form::Import do
it_behaves_like 'on successful import', 'following', 'merge', 'following_accounts.csv', [ it_behaves_like 'on successful import', 'following', 'merge', 'following_accounts.csv', [
{ 'acct' => 'user@example.com', 'show_reblogs' => true, 'notify' => false, 'languages' => nil }, { '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', [ it_behaves_like 'on successful import', 'muting', 'merge', 'muted_accounts.csv', [