Merge branch 'issue#325836-fix-empty-line-after-let-it-be-models-packages' into 'master'

Fix EmptyLineAfterFinalLetItBe offenses in spec/models/packages

See merge request gitlab-org/gitlab!58370

.rubocop_manual_todo.yml

@@ -710,10 +710,6 @@ RSpec/EmptyLineAfterFinalLetItBe:
     - spec/models/note_spec.rb
     - spec/models/notification_setting_spec.rb
     - spec/models/operations/feature_flag_spec.rb
-    - spec/models/packages/dependency_spec.rb
-    - spec/models/packages/go/module_version_spec.rb
-    - spec/models/packages/package_spec.rb
-    - spec/models/packages/tag_spec.rb
     - spec/models/plan_limits_spec.rb
     - spec/models/prometheus_alert_spec.rb
     - spec/models/protected_branch/push_access_level_spec.rb

changelogs/unreleased/issue-325836-fix-empty-line-after-let-it-be-models-packages.yml

+---
+title: Fix EmptyLineAfterFinalLetItBe offenses in spec/models/packages
+merge_request: 58370
+author: Huzaifa Iftikhar @huzaifaiftikhar
+type: fixed

spec/models/packages/dependency_spec.rb

@@ -18,6 +18,7 @@ RSpec.describe Packages::Dependency, type: :model do
     let_it_be(:package_dependency1) { create(:packages_dependency, name: 'foo', version_pattern: '~1.0.0') }
     let_it_be(:package_dependency2) { create(:packages_dependency, name: 'bar', version_pattern: '~2.5.0') }
     let_it_be(:expected_ids) { [package_dependency1.id, package_dependency2.id] }
+
     let(:names_and_version_patterns) { build_names_and_version_patterns(package_dependency1, package_dependency2) }
     let(:chunk_size) { 50 }
     let(:rows_limit) { 50 }
@@ -40,6 +41,7 @@ RSpec.describe Packages::Dependency, type: :model do
 
     context 'with a name bigger than column size' do
       let_it_be(:big_name) { 'a' * (Packages::Dependency::MAX_STRING_LENGTH + 1) }
+
       let(:names_and_version_patterns) { build_names_and_version_patterns(package_dependency1, package_dependency2).merge(big_name => '~1.0.0') }
 
       it { is_expected.to match_array(expected_ids) }
@@ -47,6 +49,7 @@ RSpec.describe Packages::Dependency, type: :model do
 
     context 'with a version pattern bigger than column size' do
       let_it_be(:big_version_pattern) { 'a' * (Packages::Dependency::MAX_STRING_LENGTH + 1) }
+
       let(:names_and_version_patterns) { build_names_and_version_patterns(package_dependency1, package_dependency2).merge('test' => big_version_pattern) }
 
       it { is_expected.to match_array(expected_ids) }
@@ -65,6 +68,7 @@ RSpec.describe Packages::Dependency, type: :model do
       let_it_be(:package_dependency5) { create(:packages_dependency, name: 'foo5', version_pattern: '~1.5.5') }
       let_it_be(:package_dependency6) { create(:packages_dependency, name: 'foo6', version_pattern: '~1.5.6') }
       let_it_be(:package_dependency7) { create(:packages_dependency, name: 'foo7', version_pattern: '~1.5.7') }
+
       let(:expected_ids) { [package_dependency1.id, package_dependency2.id, package_dependency3.id, package_dependency4.id, package_dependency5.id, package_dependency6.id, package_dependency7.id] }
       let(:names_and_version_patterns) { build_names_and_version_patterns(package_dependency1, package_dependency2, package_dependency3, package_dependency4, package_dependency5, package_dependency6, package_dependency7) }
 
@@ -86,6 +90,7 @@ RSpec.describe Packages::Dependency, type: :model do
     let_it_be(:package_dependency1) { create(:packages_dependency, name: 'foo', version_pattern: '~1.0.0') }
     let_it_be(:package_dependency2) { create(:packages_dependency, name: 'bar', version_pattern: '~2.5.0') }
     let_it_be(:expected_array) { [package_dependency1, package_dependency2] }
+
     let(:names_and_version_patterns) { build_names_and_version_patterns(package_dependency1, package_dependency2) }
 
     subject { Packages::Dependency.for_package_names_and_version_patterns(names_and_version_patterns) }

spec/models/packages/go/module_version_spec.rb

@@ -32,16 +32,19 @@ RSpec.describe Packages::Go::ModuleVersion, type: :model do
   describe '#name' do
     context 'with ref and name specified' do
       let_it_be(:version) { create :go_module_version, mod: mod, name: 'foobar', commit: project.repository.head_commit, ref: project.repository.find_tag('v1.0.0') }
+
       it('returns that name') { expect(version.name).to eq('foobar') }
     end
 
     context 'with ref specified and name unspecified' do
       let_it_be(:version) { create :go_module_version, mod: mod, commit: project.repository.head_commit, ref: project.repository.find_tag('v1.0.0') }
+
       it('returns the name of the ref') { expect(version.name).to eq('v1.0.0') }
     end
 
     context 'with ref and name unspecified' do
       let_it_be(:version) { create :go_module_version, mod: mod, commit: project.repository.head_commit }
+
       it('returns nil') { expect(version.name).to eq(nil) }
     end
   end
@@ -49,11 +52,13 @@ RSpec.describe Packages::Go::ModuleVersion, type: :model do
   describe '#gomod' do
     context 'with go.mod missing' do
       let_it_be(:version) { create :go_module_version, :tagged, mod: mod, name: 'v1.0.0' }
+
       it('returns nil') { expect(version.gomod).to eq(nil) }
     end
 
     context 'with go.mod present' do
       let_it_be(:version) { create :go_module_version, :tagged, mod: mod, name: 'v1.0.1' }
+
       it('returns the contents of go.mod') { expect(version.gomod).to eq("module #{mod.name}\n") }
     end
   end
@@ -62,6 +67,7 @@ RSpec.describe Packages::Go::ModuleVersion, type: :model do
     context 'with a root module' do
       context 'with an empty module path' do
         let_it_be(:version) { create :go_module_version, :tagged, mod: mod, name: 'v1.0.2' }
+
         it_behaves_like '#files', 'all the files', 'README.md', 'go.mod', 'a.go', 'pkg/b.go'
       end
     end
@@ -69,12 +75,14 @@ RSpec.describe Packages::Go::ModuleVersion, type: :model do
     context 'with a root module and a submodule' do
       context 'with an empty module path' do
         let_it_be(:version) { create :go_module_version, :tagged, mod: mod, name: 'v1.0.3' }
+
         it_behaves_like '#files', 'files excluding the submodule', 'README.md', 'go.mod', 'a.go', 'pkg/b.go'
       end
 
       context 'with the submodule\'s path' do
         let_it_be(:mod) { create :go_module, project: project, path: 'mod' }
         let_it_be(:version) { create :go_module_version, :tagged, mod: mod, name: 'v1.0.3' }
+
         it_behaves_like '#files', 'the submodule\'s files', 'mod/go.mod', 'mod/a.go'
       end
     end
@@ -84,6 +92,7 @@ RSpec.describe Packages::Go::ModuleVersion, type: :model do
     context 'with a root module' do
       context 'with an empty module path' do
         let_it_be(:version) { create :go_module_version, :tagged, mod: mod, name: 'v1.0.2' }
+
         it_behaves_like '#archive', 'all the files', 'README.md', 'go.mod', 'a.go', 'pkg/b.go'
       end
     end
@@ -91,12 +100,14 @@ RSpec.describe Packages::Go::ModuleVersion, type: :model do
     context 'with a root module and a submodule' do
       context 'with an empty module path' do
         let_it_be(:version) { create :go_module_version, :tagged, mod: mod, name: 'v1.0.3' }
+
         it_behaves_like '#archive', 'files excluding the submodule', 'README.md', 'go.mod', 'a.go', 'pkg/b.go'
       end
 
       context 'with the submodule\'s path' do
         let_it_be(:mod) { create :go_module, project: project, path: 'mod' }
         let_it_be(:version) { create :go_module_version, :tagged, mod: mod, name: 'v1.0.3' }
+
         it_behaves_like '#archive', 'the submodule\'s files', 'go.mod', 'a.go'
       end
     end

spec/models/packages/package_spec.rb

@@ -47,6 +47,7 @@ RSpec.describe Packages::Package, type: :model do
   describe '.sort_by_attribute' do
     let_it_be(:group) { create(:group, :public) }
     let_it_be(:project) { create(:project, :public, namespace: group, name: 'project A') }
+
     let!(:package1) { create(:npm_package, project: project, version: '3.1.0', name: "@#{project.root_namespace.path}/foo1") }
     let!(:package2) { create(:nuget_package, project: project, version: '2.0.4') }
     let(:package3) { create(:maven_package, project: project, version: '1.1.1', name: 'zzz') }
@@ -896,6 +897,7 @@ RSpec.describe Packages::Package, type: :model do
     let_it_be(:package_name) { 'composer-package-name' }
     let_it_be(:json) { { 'name' => package_name } }
     let_it_be(:project) { create(:project, :custom_repo, files: { 'composer.json' => json.to_json } ) }
+
     let!(:package) { create(:composer_package, :with_metadatum, project: project, name: package_name, version: '1.0.0', json: json) }
 
     before do

spec/models/packages/tag_spec.rb

@@ -41,6 +41,7 @@ RSpec.describe Packages::Tag, type: :model do
     let_it_be(:tag1) { create(:packages_tag, package: package, name: 'tag1') }
     let_it_be(:tag2) { create(:packages_tag, package: package, name: 'tag2') }
     let_it_be(:tag3) { create(:packages_tag, package: package, name: 'tag3') }
+
     let(:name) { 'tag1' }
 
     subject { described_class.with_name(name) }