Fix `Naming/VariableNumber` cop (#27447)

This commit is contained in:
Matt Jankowski 2023-10-18 08:26:22 -04:00 committed by GitHub
parent 7c3fea7275
commit a1b27d8b61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 43 deletions

View File

@ -86,20 +86,6 @@ Metrics/CyclomaticComplexity:
Metrics/PerceivedComplexity: Metrics/PerceivedComplexity:
Max: 27 Max: 27
# Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
# SupportedStyles: snake_case, normalcase, non_integer
# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
Naming/VariableNumber:
Exclude:
- 'db/migrate/20180106000232_add_index_on_statuses_for_api_v1_accounts_account_id_statuses.rb'
- 'db/migrate/20180514140000_revert_index_change_on_statuses_for_api_v1_accounts_account_id_statuses.rb'
- 'db/migrate/20190820003045_update_statuses_index.rb'
- 'db/migrate/20190823221802_add_local_index_to_statuses.rb'
- 'db/migrate/20200119112504_add_public_index_to_statuses.rb'
- 'spec/models/account_spec.rb'
- 'spec/models/domain_block_spec.rb'
- 'spec/models/user_spec.rb'
Performance/MapMethodChain: Performance/MapMethodChain:
Exclude: Exclude:
- 'app/models/feed.rb' - 'app/models/feed.rb'

4
db/migrate/.rubocop.yml Normal file
View File

@ -0,0 +1,4 @@
inherit_from: ../../.rubocop.yml
Naming/VariableNumber:
CheckSymbols: false

View File

@ -719,10 +719,10 @@ RSpec.describe Account do
context 'when is local' do context 'when is local' do
it 'is invalid if the username is not unique in case-insensitive comparison among local accounts' do it 'is invalid if the username is not unique in case-insensitive comparison among local accounts' do
account_1 = Fabricate(:account, username: 'the_doctor') _account = Fabricate(:account, username: 'the_doctor')
account_2 = Fabricate.build(:account, username: 'the_Doctor') non_unique_account = Fabricate.build(:account, username: 'the_Doctor')
account_2.valid? non_unique_account.valid?
expect(account_2).to model_have_error_on_field(:username) expect(non_unique_account).to model_have_error_on_field(:username)
end end
it 'is invalid if the username is reserved' do it 'is invalid if the username is reserved' do
@ -743,9 +743,9 @@ RSpec.describe Account do
end end
it 'is valid if we are creating a possibly-conflicting instance actor account' do it 'is valid if we are creating a possibly-conflicting instance actor account' do
account_1 = Fabricate(:account, username: 'examplecom') _account = Fabricate(:account, username: 'examplecom')
account_2 = Fabricate.build(:account, id: -99, actor_type: 'Application', locked: true, username: 'example.com') instance_account = Fabricate.build(:account, id: -99, actor_type: 'Application', locked: true, username: 'example.com')
expect(account_2.valid?).to be true expect(instance_account.valid?).to be true
end end
it 'is invalid if the username doesn\'t only contains letters, numbers and underscores' do it 'is invalid if the username doesn\'t only contains letters, numbers and underscores' do
@ -877,17 +877,17 @@ RSpec.describe Account do
describe 'remote' do describe 'remote' do
it 'returns an array of accounts who have a domain' do it 'returns an array of accounts who have a domain' do
account_1 = Fabricate(:account, domain: nil) _account = Fabricate(:account, domain: nil)
account_2 = Fabricate(:account, domain: 'example.com') account_with_domain = Fabricate(:account, domain: 'example.com')
expect(described_class.remote).to contain_exactly(account_2) expect(described_class.remote).to contain_exactly(account_with_domain)
end end
end end
describe 'local' do describe 'local' do
it 'returns an array of accounts who do not have a domain' do it 'returns an array of accounts who do not have a domain' do
account_1 = Fabricate(:account, domain: nil) local_account = Fabricate(:account, domain: nil)
account_2 = Fabricate(:account, domain: 'example.com') _account_with_domain = Fabricate(:account, domain: 'example.com')
expect(described_class.where('id > 0').local).to contain_exactly(account_1) expect(described_class.where('id > 0').local).to contain_exactly(local_account)
end end
end end
@ -911,17 +911,17 @@ RSpec.describe Account do
describe 'silenced' do describe 'silenced' do
it 'returns an array of accounts who are silenced' do it 'returns an array of accounts who are silenced' do
account_1 = Fabricate(:account, silenced: true) silenced_account = Fabricate(:account, silenced: true)
account_2 = Fabricate(:account, silenced: false) _account = Fabricate(:account, silenced: false)
expect(described_class.silenced).to contain_exactly(account_1) expect(described_class.silenced).to contain_exactly(silenced_account)
end end
end end
describe 'suspended' do describe 'suspended' do
it 'returns an array of accounts who are suspended' do it 'returns an array of accounts who are suspended' do
account_1 = Fabricate(:account, suspended: true) suspended_account = Fabricate(:account, suspended: true)
account_2 = Fabricate(:account, suspended: false) _account = Fabricate(:account, suspended: false)
expect(described_class.suspended).to contain_exactly(account_1) expect(described_class.suspended).to contain_exactly(suspended_account)
end end
end end

View File

@ -11,10 +11,10 @@ RSpec.describe DomainBlock do
end end
it 'is invalid if the same normalized domain already exists' do it 'is invalid if the same normalized domain already exists' do
domain_block_1 = Fabricate(:domain_block, domain: 'にゃん') _domain_block = Fabricate(:domain_block, domain: 'にゃん')
domain_block_2 = Fabricate.build(:domain_block, domain: 'xn--r9j5b5b') domain_block_with_normalized_value = Fabricate.build(:domain_block, domain: 'xn--r9j5b5b')
domain_block_2.valid? domain_block_with_normalized_value.valid?
expect(domain_block_2).to model_have_error_on_field(:domain) expect(domain_block_with_normalized_value).to model_have_error_on_field(:domain)
end end
end end

View File

@ -55,17 +55,17 @@ RSpec.describe User do
describe 'scopes' do describe 'scopes' do
describe 'recent' do describe 'recent' do
it 'returns an array of recent users ordered by id' do it 'returns an array of recent users ordered by id' do
user_1 = Fabricate(:user) first_user = Fabricate(:user)
user_2 = Fabricate(:user) second_user = Fabricate(:user)
expect(described_class.recent).to eq [user_2, user_1] expect(described_class.recent).to eq [second_user, first_user]
end end
end end
describe 'confirmed' do describe 'confirmed' do
it 'returns an array of users who are confirmed' do it 'returns an array of users who are confirmed' do
user_1 = Fabricate(:user, confirmed_at: nil) unconfirmed_user = Fabricate(:user, confirmed_at: nil)
user_2 = Fabricate(:user, confirmed_at: Time.zone.now) confirmed_user = Fabricate(:user, confirmed_at: Time.zone.now)
expect(described_class.confirmed).to contain_exactly(user_2) expect(described_class.confirmed).to contain_exactly(confirmed_user)
end end
end end