From 6988b04ec7819d29d996c0a39e33052e625c3f66 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Sat, 18 Feb 2023 16:54:30 -0500 Subject: [PATCH] Autofix Rubocop Style/TrailingCommaInArrayLiteral (#23692) --- .rubocop_todo.yml | 12 ------------ spec/helpers/jsonld_helper_spec.rb | 2 +- spec/lib/extractor_spec.rb | 2 +- .../activitypub/process_account_service_spec.rb | 2 +- .../activitypub/process_collection_service_spec.rb | 12 ++++++------ .../activitypub/move_distribution_worker_spec.rb | 2 +- 6 files changed, 10 insertions(+), 22 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index ca2b085c9c..5f03f3b783 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -3405,18 +3405,6 @@ Style/SymbolProc: Exclude: - 'spec/lib/request_spec.rb' -# Offense count: 10 -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: EnforcedStyleForMultiline. -# SupportedStylesForMultiline: comma, consistent_comma, no_comma -Style/TrailingCommaInArrayLiteral: - Exclude: - - 'spec/helpers/jsonld_helper_spec.rb' - - 'spec/lib/extractor_spec.rb' - - 'spec/services/activitypub/process_account_service_spec.rb' - - 'spec/services/activitypub/process_collection_service_spec.rb' - - 'spec/workers/activitypub/move_distribution_worker_spec.rb' - # Offense count: 4 # This cop supports safe autocorrection (--autocorrect). Style/UnpackFirst: diff --git a/spec/helpers/jsonld_helper_spec.rb b/spec/helpers/jsonld_helper_spec.rb index 744a14f260..debee17f0f 100644 --- a/spec/helpers/jsonld_helper_spec.rb +++ b/spec/helpers/jsonld_helper_spec.rb @@ -113,7 +113,7 @@ describe JsonLdHelper do { 'type' => 'Mention', 'href' => ['foo'], - } + }, ], }, 'signature' => { diff --git a/spec/lib/extractor_spec.rb b/spec/lib/extractor_spec.rb index 9c9f5ef046..560617ed7d 100644 --- a/spec/lib/extractor_spec.rb +++ b/spec/lib/extractor_spec.rb @@ -20,7 +20,7 @@ describe Extractor do text = '@screen_name' extracted = Extractor.extract_mentions_or_lists_with_indices(text) expect(extracted).to eq [ - { screen_name: 'screen_name', indices: [0, 12] } + { screen_name: 'screen_name', indices: [0, 12] }, ] end diff --git a/spec/services/activitypub/process_account_service_spec.rb b/spec/services/activitypub/process_account_service_spec.rb index 8e6ed178e0..d0af7de769 100644 --- a/spec/services/activitypub/process_account_service_spec.rb +++ b/spec/services/activitypub/process_account_service_spec.rb @@ -173,7 +173,7 @@ RSpec.describe ActivityPub::ProcessAccountService, type: :service do type: 'Mention', href: "https://foo.test/users/#{i + 1}", name: "@user#{i + 1}", - } + }, ], to: ['as:Public', "https://foo.test/users/#{i + 1}"], }.with_indifferent_access diff --git a/spec/services/activitypub/process_collection_service_spec.rb b/spec/services/activitypub/process_collection_service_spec.rb index 0fa5321bc7..fbfa6d6c6b 100644 --- a/spec/services/activitypub/process_collection_service_spec.rb +++ b/spec/services/activitypub/process_collection_service_spec.rb @@ -107,17 +107,17 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do '@context': [ 'https://www.w3.org/ns/activitystreams', nil, - { object: 'https://www.w3.org/ns/activitystreams#object' } + { object: 'https://www.w3.org/ns/activitystreams#object' }, ], id: 'https://example.com/users/bob/fake-status/activity', type: 'Create', actor: 'https://example.com/users/bob', published: '2022-01-22T15:00:00Z', to: [ - 'https://www.w3.org/ns/activitystreams#Public' + 'https://www.w3.org/ns/activitystreams#Public', ], cc: [ - 'https://example.com/users/bob/followers' + 'https://example.com/users/bob/followers', ], signature: { type: 'RsaSignature2017', @@ -140,10 +140,10 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do url: 'https://www.youtube.com/watch?v=dQw4w9WgXcQ&feature=puck-was-here', attributedTo: 'https://example.com/users/bob', to: [ - 'https://www.w3.org/ns/activitystreams#Public' + 'https://www.w3.org/ns/activitystreams#Public', ], cc: [ - 'https://example.com/users/bob/followers' + 'https://example.com/users/bob/followers', ], sensitive: false, atomUri: 'https://example.com/users/bob/fake-status', @@ -166,7 +166,7 @@ RSpec.describe ActivityPub::ProcessCollectionService, type: :service do { '@value': '

hello world

', '@language': 'en', - } + }, ], 'https://www.w3.org/ns/activitystreams#published': { '@type': 'http://www.w3.org/2001/XMLSchema#dateTime', diff --git a/spec/workers/activitypub/move_distribution_worker_spec.rb b/spec/workers/activitypub/move_distribution_worker_spec.rb index 57941065a7..482fa9db44 100644 --- a/spec/workers/activitypub/move_distribution_worker_spec.rb +++ b/spec/workers/activitypub/move_distribution_worker_spec.rb @@ -16,7 +16,7 @@ describe ActivityPub::MoveDistributionWorker do it 'delivers to followers and known blockers' do expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [ [kind_of(String), migration.account.id, 'http://example.com'], - [kind_of(String), migration.account.id, 'http://example2.com'] + [kind_of(String), migration.account.id, 'http://example2.com'], ]) subject.perform(migration.id) end