Skip to content

Commit

Permalink
Fix auto-correctable rubocop offenses in test suite
Browse files Browse the repository at this point in the history
  • Loading branch information
rlue committed May 28, 2019
1 parent e907c13 commit 2ac28bf
Show file tree
Hide file tree
Showing 119 changed files with 1,405 additions and 1,531 deletions.
182 changes: 1 addition & 181 deletions .rubocop_todo.rspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,6 @@
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.

# Offense count: 36
# Cop supports --auto-correct.
# Configuration parameters: EnabledMethods.
Capybara/FeatureMethods:
Exclude:
- 'spec/system/basic/authentication_spec.rb'
- 'spec/system/basic/redirects_spec.rb'
- 'spec/system/basic/richtext_spec.rb'
- 'spec/system/js/q_unit_spec.rb'
- 'spec/system/setup/auto_wizard_spec.rb'
- 'spec/system/setup/mail_accounts_spec.rb'
- 'spec/system/setup/system_spec.rb'
- 'spec/system/ticket/create_spec.rb'
- 'spec/system/ticket/update_spec.rb'

# Offense count: 39
# Cop supports --auto-correct.
# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
Layout/ExtraSpacing:
Exclude:
- 'spec/factories/job.rb'
- 'spec/factories/postmaster_filter.rb'
- 'spec/factories/ticket.rb'
- 'spec/factories/ticket/article.rb'
- 'spec/lib/sequencer/unit/import/zendesk/sub_sequence/base_examples.rb'
- 'spec/models/calendar_spec.rb'
- 'spec/models/channel/email_parser_spec.rb'
- 'spec/models/cti/caller_id_spec.rb'
- 'spec/models/job_spec.rb'
- 'spec/models/recent_view_spec.rb'
- 'spec/models/role_spec.rb'
- 'spec/models/ticket_spec.rb'
- 'spec/models/trigger_spec.rb'
- 'spec/requests/ticket_spec.rb'

# Offense count: 43
Lint/UselessAssignment:
Enabled: false
Expand All @@ -53,7 +18,7 @@ Lint/UselessAssignment:
# Configuration parameters: CountComments, ExcludedMethods.
# ExcludedMethods: refine
Metrics/BlockLength:
Max: 1969
Max: 1987

# Offense count: 16
RSpec/AnyInstance:
Expand Down Expand Up @@ -84,48 +49,6 @@ RSpec/BeforeAfterAll:
RSpec/ContextWording:
Enabled: false

# Offense count: 1
RSpec/DescribeClass:
Exclude:
- 'spec/scripts/websocket_server_spec.rb'

# Offense count: 207
# Cop supports --auto-correct.
# Configuration parameters: SkipBlocks, EnforcedStyle.
# SupportedStyles: described_class, explicit
RSpec/DescribedClass:
Enabled: false

# Offense count: 15
# Cop supports --auto-correct.
RSpec/EmptyLineAfterFinalLet:
Exclude:
- 'spec/db/migrate/issue_1905_exchange_login_from_remote_id_spec.rb'
- 'spec/db/migrate/issue_2541_fix_notification_email_without_body_spec.rb'
- 'spec/lib/import/zendesk/object_attribute/base_examples.rb'
- 'spec/models/cti/log_spec.rb'
- 'spec/models/object_manager/attribute/validation/future_past_spec.rb'
- 'spec/models/object_manager/attribute/validation/required_spec.rb'
- 'spec/models/ticket_spec.rb'
- 'spec/models/user_spec.rb'
- 'spec/requests/integration/twitter_webhook_spec.rb'

# Offense count: 25
# Cop supports --auto-correct.
RSpec/EmptyLineAfterHook:
Exclude:
- 'spec/lib/notification_factory/slack_spec.rb'
- 'spec/lib/notification_factory_spec.rb'
- 'spec/models/role_spec.rb'
- 'spec/models/ticket_spec.rb'
- 'spec/models/trigger_spec.rb'
- 'spec/models/user_spec.rb'

# Offense count: 34
# Cop supports --auto-correct.
RSpec/EmptyLineAfterSubject:
Enabled: false

# Offense count: 540
# Configuration parameters: Max.
RSpec/ExampleLength:
Expand All @@ -144,13 +67,6 @@ RSpec/ExpectActual:
- 'spec/requests/user/organization_spec.rb'
- 'spec/requests/user_spec.rb'

# Offense count: 99
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle.
# SupportedStyles: method_call, block
RSpec/ExpectChange:
Enabled: false

# Offense count: 3
RSpec/ExpectInHook:
Exclude:
Expand All @@ -175,20 +91,6 @@ RSpec/FilePath:
- 'spec/db/migrate/issue_2541_fix_notification_email_without_body_spec.rb'
- 'spec/lib/import/base_factory_spec.rb'

# Offense count: 30
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle.
# SupportedStyles: implicit, each, example
RSpec/HookArgument:
Enabled: false

# Offense count: 4
# Cop supports --auto-correct.
RSpec/HooksBeforeExamples:
Exclude:
- 'spec/models/concerns/has_groups_examples.rb'
- 'spec/models/trigger_spec.rb'

# Offense count: 60
# Configuration parameters: AssignmentOnly.
RSpec/InstanceVariable:
Expand All @@ -205,36 +107,6 @@ RSpec/InstanceVariable:
- 'spec/requests/ticket/article_attachments_spec.rb'
- 'spec/requests/user_spec.rb'

# Offense count: 2
RSpec/IteratedExpectation:
Exclude:
- 'spec/jobs/update_cti_logs_by_caller_job_spec.rb'

# Offense count: 10
# Cop supports --auto-correct.
RSpec/LeadingSubject:
Exclude:
- 'spec/lib/notification_factory/slack_spec.rb'
- 'spec/models/object_manager/attribute/validation/backend_spec.rb'
- 'spec/models/object_manager/attribute/validation/future_past_spec.rb'
- 'spec/models/object_manager/attribute/validation/required_spec.rb'
- 'spec/models/role_spec.rb'
- 'spec/models/ticket/article_spec.rb'
- 'spec/models/trigger_spec.rb'
- 'spec/models/user_spec.rb'

# Offense count: 15
# Cop supports --auto-correct.
RSpec/LetBeforeExamples:
Exclude:
- 'spec/lib/import/otrs/article/attachment_factory_spec.rb'
- 'spec/lib/import/otrs/dynamic_field_factory_spec.rb'
- 'spec/lib/import/otrs/dynamic_field_spec.rb'
- 'spec/lib/ldap/group_spec.rb'
- 'spec/lib/ldap/user_spec.rb'
- 'spec/lib/ldap_spec.rb'
- 'spec/models/user_spec.rb'

# Offense count: 34
RSpec/LetSetup:
Enabled: false
Expand Down Expand Up @@ -274,52 +146,13 @@ RSpec/NamedSubject:
RSpec/NestedGroups:
Max: 8

# Offense count: 28
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle.
# SupportedStyles: not_to, to_not
RSpec/NotToNot:
Exclude:
- 'spec/db/migrate/object_manager_attribute_date_remove_future_past_spec.rb'
- 'spec/lib/import/otrs/user_factory_spec.rb'
- 'spec/lib/migration_job/ldap_samaccountname_to_uid_spec.rb'
- 'spec/lib/report/ticket_generic_time_spec.rb'
- 'spec/lib/stats_spec.rb'
- 'spec/models/object_manager/attribute/validation_spec.rb'
- 'spec/models/object_manager/attribute_spec.rb'
- 'spec/requests/integration/idoit_spec.rb'
- 'spec/requests/integration/twilio_sms_spec.rb'
- 'spec/requests/integration/user_device_spec.rb'
- 'spec/requests/search_spec.rb'
- 'spec/requests/text_module_spec.rb'
- 'spec/requests/ticket/article_spec.rb'

# Offense count: 81
# Cop supports --auto-correct.
# Configuration parameters: Strict, EnforcedStyle.
# SupportedStyles: inflected, explicit
RSpec/PredicateMatcher:
Exclude:
- 'spec/lib/password_hash_spec.rb'
- 'spec/models/trigger/sms_spec.rb'
- 'spec/requests/api_auth_on_behalf_of_spec.rb'
- 'spec/requests/api_auth_spec.rb'
- 'spec/requests/integration/monitoring_spec.rb'
- 'spec/requests/organization_spec.rb'
- 'spec/requests/user_spec.rb'

# Offense count: 12
RSpec/RepeatedDescription:
Exclude:
- 'spec/models/translation_spec.rb'
- 'spec/requests/form_spec.rb'
- 'spec/requests/ticket_spec.rb'

# Offense count: 2
RSpec/RepeatedExample:
Exclude:
- 'spec/models/translation_spec.rb'

# Offense count: 3
RSpec/ScatteredLet:
Exclude:
Expand Down Expand Up @@ -347,16 +180,3 @@ RSpec/SubjectStub:
# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
RSpec/VerifiedDoubles:
Enabled: false

# Offense count: 2
RSpec/VoidExpect:
Exclude:
- 'spec/lib/ldap/group_spec.rb'
- 'spec/lib/ldap/user_spec.rb'

# Offense count: 741
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle.
# SupportedStyles: numeric, symbolic
Rails/HttpStatus:
Enabled: false
2 changes: 1 addition & 1 deletion spec/db/migrate/issue_1219_zhtw_locale_typo_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
let(:translation) { create(:translation, locale: premigrate_locale) }
let(:user) { create(:user, preferences: { locale: premigrate_locale }) }

before(:each) do
before do
Locale.find_by(name: 'Chinese (Tradi.) (正體中文)')&.destroy
stub_const("#{described_class}::CURRENT_VERSION", version)
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

context 'blank config' do
let(:config) { nil }

it_behaves_like 'irrelevant config'
end

Expand All @@ -53,6 +54,7 @@
some: 'config'
}
end

it_behaves_like 'irrelevant config'
end

Expand All @@ -64,6 +66,7 @@
}
}
end

it_behaves_like 'irrelevant config'
end

Expand All @@ -76,6 +79,7 @@
}
}
end

it_behaves_like 'irrelevant config'
end
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@

expect do
migrate
end.to change {
OnlineNotification.count
}.by(-1)
end.to change(OnlineNotification, :count).by(-1)
end

it 'cleans up RecentView#created_by_id', db_strategy: :reset do
Expand All @@ -30,9 +28,7 @@

expect do
migrate
end.to change {
RecentView.count
}.by(-1)
end.to change(RecentView, :count).by(-1)
end

it 'cleans up Avatar#o_id', db_strategy: :reset do
Expand All @@ -44,9 +40,7 @@

expect do
migrate
end.to change {
Avatar.count
}.by(-1)
end.to change(Avatar, :count).by(-1)
end

end
Expand Down
21 changes: 9 additions & 12 deletions spec/db/migrate/issue_2333_object_country_already_exists_spec.rb
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
require 'rails_helper'

RSpec.describe AddCountryAttributeToUsers, type: :db_migration do

context 'AddCountryAttributeToUsers migration' do

def country_attribute
ObjectManager::Attribute.find_by(object_lookup_id: ObjectLookup.by_name('User'), name: 'country')
end

it 'preserves the existing country attribute' do
expect { migrate }
.not_to(change { country_attribute.present? })
.not_to change { ObjectManager::Attribute.find_by(object_lookup_id: ObjectLookup.by_name('User'), name: 'country') }
end

it 'adds the country attribute when it is not present' do
country_attribute.delete
expect { migrate }
.to change { country_attribute.present? }
.from( false ).to( true )
context 'when country attribute is not present' do
before { ObjectManager::Attribute.find_by(object_lookup_id: ObjectLookup.by_name('User'), name: 'country').delete }

it 'adds the country attribute when it is not present' do
expect { migrate }
.to change { ObjectManager::Attribute.exists?(object_lookup_id: ObjectLookup.by_name('User'), name: 'country') }
.from(false).to(true)
end
end
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@

context 'when migrating Jobs' do
subject(:job) { create(:job) }

let(:type) { 'notification.email' }

it "updates empty perform['notification.email']['body'] attribute" do
Expand All @@ -48,6 +49,7 @@

describe 'scheduler management' do
let(:scheduler) { Scheduler.find_by(method: 'Job.run') }

before { scheduler.update!(active: false) }

it "re-enables 'Job.run' Scheduler" do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

migrate

expect(subject.data_option).to_not include(:past, :future)
expect(subject.data_option).not_to include(:past, :future)
end

context 'when incomplete data_option is given' do
Expand Down
4 changes: 2 additions & 2 deletions spec/jobs/update_cti_logs_by_caller_job_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
it 'updates Cti::Logs from that number with "preferences" => {}' do
described_class.perform_now(phone)

log_prefs.each { |p| expect(p).to be_empty }
expect(log_prefs).to all(be_empty)
end
end

Expand All @@ -24,7 +24,7 @@
it 'updates Cti::Logs from that number with valid "preferences" hash' do
described_class.perform_now(phone)

log_prefs.each { |p| expect(p).to include('from' => a_kind_of(Array)) }
expect(log_prefs).to all(include('from' => a_kind_of(Array)))
end
end
end
Loading

0 comments on commit 2ac28bf

Please sign in to comment.