Skip to content

Commit

Permalink
Merge pull request #10030 from saraycp/rubocop_autocorrect_I
Browse files Browse the repository at this point in the history
Correct Rubocop Rspec/EmptyLineAfterFinalLet offenses
  • Loading branch information
dmarcoux committed Aug 20, 2020
2 parents b050a3d + e3ddf9f commit b95b465
Show file tree
Hide file tree
Showing 62 changed files with 142 additions and 67 deletions.
68 changes: 1 addition & 67 deletions src/api/.rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 100`
# on 2020-08-18 11:56:28 UTC using RuboCop version 0.89.1.
# on 2020-08-19 10:32:08 UTC using RuboCop version 0.89.1.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
Expand Down Expand Up @@ -588,72 +588,6 @@ RSpec/EmptyExampleGroup:
- 'spec/helpers/webui/webui_helper_spec.rb'
- 'spec/models/relationship_spec.rb'

# Offense count: 141
# Cop supports --auto-correct.
RSpec/EmptyLineAfterFinalLet:
Exclude:
- 'spec/controllers/cloud/upload_jobs_controller_spec.rb'
- 'spec/controllers/request_controller_spec.rb'
- 'spec/controllers/source_attribute_controller_spec.rb'
- 'spec/controllers/source_project_meta_controller_spec.rb'
- 'spec/controllers/staging/excluded_requests_controller_spec.rb'
- 'spec/controllers/status/required_checks_controller_spec.rb'
- 'spec/controllers/trigger_controller_spec.rb'
- 'spec/controllers/webui/cloud/azure/upload_jobs_controller_spec.rb'
- 'spec/controllers/webui/cloud/ec2/configurations_controller_spec.rb'
- 'spec/controllers/webui/cloud/ec2/upload_jobs_controller_spec.rb'
- 'spec/controllers/webui/comments_controller_spec.rb'
- 'spec/controllers/webui/kiwi/images_controller_spec.rb'
- 'spec/controllers/webui/package_controller_spec.rb'
- 'spec/controllers/webui/packages/files_controller_spec.rb'
- 'spec/controllers/webui/request_controller_spec.rb'
- 'spec/controllers/webui/subscriptions_controller_spec.rb'
- 'spec/db/data/project_log_entry_user_name_spec.rb'
- 'spec/features/beta/webui/packages_spec.rb'
- 'spec/features/beta/webui/requests_spec.rb'
- 'spec/features/webui/packages_spec.rb'
- 'spec/features/webui/requests_spec.rb'
- 'spec/helpers/webui/projects/status_helper_spec.rb'
- 'spec/helpers/webui/webui_helper_spec.rb'
- 'spec/jobs/bs_request_action_webui_infos_job_spec.rb'
- 'spec/jobs/send_event_emails_job_spec.rb'
- 'spec/lib/influx_db/obs/middleware/backend_subscriber_spec.rb'
- 'spec/mailers/event_mailer_spec.rb'
- 'spec/models/branch_package/lookup_incident_package_spec.rb'
- 'spec/models/branch_package/set_target_project_spec.rb'
- 'spec/models/bs_request_action/differ/for_source_spec.rb'
- 'spec/models/bs_request_action/differ/query_builder_for_accepted_spec.rb'
- 'spec/models/bs_request_action/differ/query_builder_spec.rb'
- 'spec/models/bs_request_action/differ/source_package_finder_spec.rb'
- 'spec/models/bs_request_action_delete_spec.rb'
- 'spec/models/bs_request_spec.rb'
- 'spec/models/channel_binary_spec.rb'
- 'spec/models/cloud/backend/upload_job_spec.rb'
- 'spec/models/cloud/upload_job_spec.rb'
- 'spec/models/event_subscription/for_event_form_spec.rb'
- 'spec/models/kiwi/image_spec.rb'
- 'spec/models/notification_spec.rb'
- 'spec/models/owner_search_spec.rb'
- 'spec/models/package_spec.rb'
- 'spec/models/project/staging_project_spec.rb'
- 'spec/models/project_spec.rb'
- 'spec/models/repository_spec.rb'
- 'spec/models/review_spec.rb'
- 'spec/models/staging/workflow_spec.rb'
- 'spec/models/user_spec.rb'
- 'spec/presenters/comments_controller_presenters/comment_presenter_spec.rb'
- 'spec/queries/open_requests_with_project_as_source_or_target_finder_spec.rb'
- 'spec/queries/packages_finder_spec.rb'
- 'spec/services/monitor_controller_service/building_information_updater_spec.rb'
- 'spec/services/package_controller_service/url_generator_spec.rb'
- 'spec/services/package_service/file_verifier_spec.rb'
- 'spec/services/package_service/schema_verifier_spec.rb'
- 'spec/services/session_controller_service/session_creator_spec.rb'
- 'spec/services/trigger_controller_service/token_extractor_spec.rb'
- 'spec/services/webui_controller_service/user_checker_spec.rb'
- 'spec/support/shared_examples/features/boostrap_flag_tables.rb'
- 'spec/support/shared_examples/features/flags_tables.rb'

# Offense count: 317
# Configuration parameters: Max.
RSpec/ExampleLength:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@

describe '#index' do
let(:path) { "#{CONFIG['source_url']}/cloudupload?name=#{upload_job.job_id}" }

context 'without an EC2 configuration' do
let(:user) { create(:confirmed_user) }

Expand Down
2 changes: 2 additions & 0 deletions src/api/spec/controllers/request_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
describe '#request_command (cmd=diff)' do
let(:user) { create(:confirmed_user) }
let(:bs_request) { create(:set_bugowner_request) }

before do
login user
end
Expand All @@ -21,6 +22,7 @@

context 'with diff_to_superseded parameter' do
let(:another_bs_request) { create(:set_bugowner_request) }

context 'of a not superseded request' do
before do
post :request_command, params: { id: bs_request.number, cmd: :diff, format: :xml, diff_to_superseded: another_bs_request }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@

context 'with invalid user' do
let(:wrong_user) { create(:confirmed_user, login: 'tomtom') }

before do
login wrong_user
main_attribute
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
</project>
META
end

before do
login user
put :update, params: { project: project }, body: meta, format: :xml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@

context 'fails: project without staging_workflow' do
let(:project_without_staging) { create(:project, name: 'no_staging') }

before do
post :create, params: { staging_workflow_project: project_without_staging, format: :xml },
body: "<excluded_requests><request id='#{bs_request.number}' description='hey'/></excluded_requests>"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@

context 'without permission' do
let(:status) { :forbidden }

include_context 'does not create a required check'
include_context 'returns correct status'
end
Expand Down Expand Up @@ -249,6 +250,7 @@

context 'without permissions' do
let(:status) { :forbidden }

include_context 'does not delete the required check'
include_context 'returns correct status'
end
Expand Down
1 change: 1 addition & 0 deletions src/api/spec/controllers/trigger_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
context 'when user has no rights for source' do
let(:user) { create(:confirmed_user, login: 'mrfluffy') }
let(:token) { Token::Release.create(user: user, package: package) }

before do
allow(User).to receive(:session!).and_return(user)
allow(::TriggerControllerService::TokenExtractor).to receive(:new) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,19 @@

context 'with a not existing package' do
let(:params) { { project: 'AzureImages', package: 'not-existent', repository: 'standard', arch: 'x86_64', filename: 'appliance.raw.xz' } }

include_context 'it redirects and assigns flash error'
end

context 'with an invalid filename' do
let(:params) { { project: 'AzureImages', package: 'MyAzureImage', repository: 'standard', arch: 'x86_64', filename: 'appliance.rpm' } }

include_context 'it redirects and assigns flash error'
end

context 'with an invalid architecture' do
let(:params) { { project: 'AzureImages', package: 'MyAzureImage', repository: 'standard', arch: 'i386', filename: 'appliance.raw.xz' } }

include_context 'it redirects and assigns flash error'
end
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

RSpec.describe Webui::Cloud::Ec2::ConfigurationsController, type: :controller do
let(:user) { create(:confirmed_user, login: 'tom') }

before do
login(user)
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,19 @@

context 'with a not existing package' do
let(:params) { { project: 'EC2Images', package: 'not-existent', repository: 'standard', arch: 'x86_64', filename: 'appliance.raw.xz' } }

include_context 'it redirects and assigns flash error'
end

context 'with an invalid filename' do
let(:params) { { project: 'EC2Images', package: 'MyEC2Image', repository: 'standard', arch: 'x86_64', filename: 'appliance.rpm' } }

include_context 'it redirects and assigns flash error'
end

context 'with an invalid architecture' do
let(:params) { { project: 'EC2Images', package: 'MyEC2Image', repository: 'standard', arch: 'i386', filename: 'appliance.raw.xz' } }

include_context 'it redirects and assigns flash error'
end
end
Expand Down
3 changes: 3 additions & 0 deletions src/api/spec/controllers/webui/comments_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,19 @@

context 'of a project' do
let(:commentable) { project }

include_examples 'saving a comment'
end

context 'of a package' do
let(:commentable) { package }

include_examples 'saving a comment'
end

context 'of a bs_request' do
let(:commentable) { bs_request }

include_examples 'saving a comment'
end
end
Expand Down
4 changes: 4 additions & 0 deletions src/api/spec/controllers/webui/kiwi/images_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@

context 'for the term "ap"' do
let(:term) { 'ap' }

it do
expect(JSON.parse(subject.body)).to eq([{ 'id' => 'apache', 'label' => 'apache', 'value' => 'apache' },
{ 'id' => 'apache2', 'label' => 'apache2', 'value' => 'apache2' },
Expand All @@ -367,16 +368,19 @@

context 'for the term "app"' do
let(:term) { 'app' }

it { expect(JSON.parse(subject.body)).to eq([{ 'id' => 'appArmor', 'label' => 'appArmor', 'value' => 'appArmor' }]) }
end

context 'for the term "b"' do
let(:term) { 'b' }

it { expect(JSON.parse(subject.body)).to eq([{ 'id' => 'bcrypt', 'label' => 'bcrypt', 'value' => 'bcrypt' }]) }
end

context 'for the term "c"' do
let(:term) { 'c' }

it { expect(JSON.parse(subject.body)).to be_empty }
end
end
Expand Down
1 change: 1 addition & 0 deletions src/api/spec/controllers/webui/package_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -888,6 +888,7 @@ def do_request(params)
let(:other_user) { create(:confirmed_user, login: 'bar') }
let(:project) { create(:project, name: 'foo_project') }
let!(:package_with_maintainer) { create(:package_with_maintainer, maintainer: user, project: project) }

before do
login other_user
post :trigger_rebuild, params: { project: project, package: package_with_maintainer }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
</services>
XML
end

before do
do_request(project_name: source_project, package_name: source_package, filename: 'remote_file',
file_url: 'https://raw.github.com/openSUSE/open-build-service/master/.gitignore')
Expand Down
3 changes: 3 additions & 0 deletions src/api/spec/controllers/webui/request_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@

context 'full diff not requested' do
let(:expected_diff_size) { file_size_threshold + diff_header_size }

context 'for ASCII files' do
let(:target_package) do
create(:package_with_file, name: 'test-package-ascii',
Expand Down Expand Up @@ -174,6 +175,7 @@

context 'with :diff_to_superseded set' do
let(:superseded_bs_request) { create(:set_bugowner_request) }

context 'and the superseded request is superseded' do
before do
superseded_bs_request.update(state: :superseded, superseded_by: bs_request.number)
Expand Down Expand Up @@ -345,6 +347,7 @@

describe 'POST #set_bugowner_request' do
let(:bs_request) { BsRequest.find_by(creator: submitter_with_group.login, description: 'blah blah blash', state: 'new') }

context 'with valid parameters' do
before do
login(submitter_with_group)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
describe 'PUT #update' do
let!(:admin) { create(:admin_user) }
let(:params) { { subscriptions: subscription_params } }

include_context 'a user and subscriptions with defaults'

before do
Expand Down
1 change: 1 addition & 0 deletions src/api/spec/db/data/project_log_entry_user_name_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
let!(:entry1) { create(:project_log_entry_comment_for_project, user_name: user.id) }
let!(:entry2) { create(:project_log_entry_comment_for_package, user_name: other_user.id) }
let!(:entry5) { create(:project_log_entry_comment_for_package, user_name: User.last.id + 42) }

before do
ProjectLogEntryUserName.new.send(:up)
end
Expand Down
1 change: 1 addition & 0 deletions src/api/spec/features/beta/webui/packages_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@

describe 'as common user' do
let(:other_user) { create(:confirmed_user, :with_home, login: 'common_user') }

before do
login other_user
end
Expand Down
5 changes: 5 additions & 0 deletions src/api/spec/features/beta/webui/requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
context 'for role addition group' do
describe 'for projects' do
let(:roleaddition_group) { create(:group) }

it 'can be submitted' do
login submitter
visit project_show_path(project: target_project)
Expand Down Expand Up @@ -98,6 +99,7 @@
creator: submitter,
person_name: submitter)
end

it 'can be submitted' do
login submitter
visit package_show_path(project: target_project, package: target_package)
Expand Down Expand Up @@ -162,6 +164,7 @@
creator: submitter,
person_name: submitter)
end

it 'can be submitted' do
login submitter
visit package_show_path(project: target_project, package: target_package)
Expand Down Expand Up @@ -220,6 +223,7 @@

describe 'for group' do
let(:review_group) { create(:group) }

it 'opens a review' do
login submitter
visit request_show_path(bs_request)
Expand All @@ -245,6 +249,7 @@

describe 'for package' do
let(:package) { create(:package, project: submitter.home_project) }

it 'opens a review' do
login submitter
visit request_show_path(bs_request)
Expand Down
1 change: 1 addition & 0 deletions src/api/spec/features/webui/packages_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@

describe 'as common user' do
let(:other_user) { create(:confirmed_user, :with_home, login: 'common_user') }

before do
login other_user
end
Expand Down
Loading

0 comments on commit b95b465

Please sign in to comment.