Add latest changes from gitlab-org/gitlab@master

16 files changed, 23 insertions, 0 deletions

diff --git a/spec/finders/alert_management/alerts_finder_spec.rb b/spec/finders/alert_management/alerts_finder_spec.rb
index 3a88db5d854..7fcbc7b20a1 100644
--- a/spec/finders/alert_management/alerts_finder_spec.rb
+++ b/spec/finders/alert_management/alerts_finder_spec.rb
@@ -266,6 +266,7 @@ RSpec.describe AlertManagement::AlertsFinder, '#execute' do
       context 'assignee username given' do
         let_it_be(:assignee) { create(:user) }
         let_it_be(:alert) { create(:alert_management_alert, project: project, assignees: [assignee]) }
+
         let(:params) { { assignee_username: username } }
 
         context 'with valid assignee_username' do
diff --git a/spec/finders/ci/commit_statuses_finder_spec.rb b/spec/finders/ci/commit_statuses_finder_spec.rb
index 05a1a98cfe0..2e26e38f4b4 100644
--- a/spec/finders/ci/commit_statuses_finder_spec.rb
+++ b/spec/finders/ci/commit_statuses_finder_spec.rb
@@ -9,6 +9,7 @@ RSpec.describe Ci::CommitStatusesFinder, '#execute' do
 
   context 'tag refs' do
     let_it_be(:tags) { TagsFinder.new(project.repository, {}).execute }
+
     let(:subject) { described_class.new(project, project.repository, user, tags).execute }
 
     context 'no pipelines' do
@@ -131,6 +132,7 @@ RSpec.describe Ci::CommitStatusesFinder, '#execute' do
 
   context 'CI pipelines visible to' do
     let_it_be(:tags) { TagsFinder.new(project.repository, {}).execute }
+
     let(:subject) { described_class.new(project, project.repository, user, tags).execute }
 
     before do
diff --git a/spec/finders/container_repositories_finder_spec.rb b/spec/finders/container_repositories_finder_spec.rb
index 983f6dba28b..d247d61ecdb 100644
--- a/spec/finders/container_repositories_finder_spec.rb
+++ b/spec/finders/container_repositories_finder_spec.rb
@@ -9,6 +9,7 @@ RSpec.describe ContainerRepositoriesFinder do
   let_it_be(:group) { create(:group) }
   let_it_be(:project) { create(:project, group: group) }
   let_it_be(:project_repository) { create(:container_repository, name: 'my_image', project: project) }
+
   let(:params) { {} }
 
   before do
diff --git a/spec/finders/deployments_finder_spec.rb b/spec/finders/deployments_finder_spec.rb
index bd03b254f40..6d9d0c33de3 100644
--- a/spec/finders/deployments_finder_spec.rb
+++ b/spec/finders/deployments_finder_spec.rb
@@ -68,6 +68,7 @@ RSpec.describe DeploymentsFinder do
 
     context 'at project scope' do
       let_it_be(:project) { create(:project, :public, :test_repo) }
+
       let(:base_params) { { project: project } }
 
       describe 'filtering' do
@@ -76,6 +77,7 @@ RSpec.describe DeploymentsFinder do
           let_it_be(:deployment_2) { create(:deployment, :success, project: project, updated_at: 47.hours.ago) }
           let_it_be(:deployment_3) { create(:deployment, :success, project: project, updated_at: 4.days.ago) }
           let_it_be(:deployment_4) { create(:deployment, :success, project: project, updated_at: 1.hour.ago) }
+
           let(:params) { { **base_params, updated_before: 1.day.ago, updated_after: 3.days.ago, order_by: :updated_at } }
 
           it 'returns deployments with matched updated_at' do
@@ -268,6 +270,7 @@ RSpec.describe DeploymentsFinder do
       let_it_be(:group_project_1) { create(:project, :public, :test_repo, group: group) }
       let_it_be(:group_project_2) { create(:project, :public, :test_repo, group: group) }
       let_it_be(:subgroup_project_1) { create(:project, :public, :test_repo, group: subgroup) }
+
       let(:base_params) { { group: group } }
 
       describe 'ordering' do
diff --git a/spec/finders/events_finder_spec.rb b/spec/finders/events_finder_spec.rb
index fe2e449f03d..5ecd38cd9cc 100644
--- a/spec/finders/events_finder_spec.rb
+++ b/spec/finders/events_finder_spec.rb
@@ -22,6 +22,7 @@ RSpec.describe EventsFinder do
   let!(:other_developer_event) { create(:event, :created, project: project1, author: other_user, target: opened_merge_request3 ) }
 
   let_it_be(:public_project) { create(:project, :public, creator_id: user.id, namespace: user.namespace) }
+
   let(:confidential_issue) { create(:closed_issue, confidential: true, project: public_project, author: user) }
   let!(:confidential_event) { create(:event, :closed, project: public_project, author: user, target: confidential_issue) }
 
diff --git a/spec/finders/group_descendants_finder_spec.rb b/spec/finders/group_descendants_finder_spec.rb
index 3c3bb13a629..01c6eb05907 100644
--- a/spec/finders/group_descendants_finder_spec.rb
+++ b/spec/finders/group_descendants_finder_spec.rb
@@ -5,6 +5,7 @@ require 'spec_helper'
 RSpec.describe GroupDescendantsFinder do
   let_it_be(:user) { create(:user) }
   let_it_be(:group) { create(:group) }
+
   let(:params) { {} }
 
   subject(:finder) do
diff --git a/spec/finders/groups_finder_spec.rb b/spec/finders/groups_finder_spec.rb
index d69720ae98e..481e2983dd7 100644
--- a/spec/finders/groups_finder_spec.rb
+++ b/spec/finders/groups_finder_spec.rb
@@ -180,6 +180,7 @@ RSpec.describe GroupsFinder do
       let_it_be(:internal_sub_subgroup) { create(:group, :internal, parent: public_subgroup) }
       let_it_be(:private_sub_subgroup) { create(:group, :private, parent: public_subgroup) }
       let_it_be(:public_sub_subgroup) { create(:group, :public, parent: public_subgroup) }
+
       let(:params) { { include_parent_descendants: true, parent: parent_group } }
 
       context 'with nil parent' do
diff --git a/spec/finders/packages/conan/package_file_finder_spec.rb b/spec/finders/packages/conan/package_file_finder_spec.rb
index d0c9efa1418..c2f445c58f7 100644
--- a/spec/finders/packages/conan/package_file_finder_spec.rb
+++ b/spec/finders/packages/conan/package_file_finder_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 RSpec.describe ::Packages::Conan::PackageFileFinder do
   let_it_be(:package) { create(:conan_package) }
   let_it_be(:package_file) { package.package_files.first }
+
   let(:package_file_name) { package_file.file_name }
   let(:params) { {} }
 
diff --git a/spec/finders/packages/go/module_finder_spec.rb b/spec/finders/packages/go/module_finder_spec.rb
index e5c8827fc8d..a93fd855529 100644
--- a/spec/finders/packages/go/module_finder_spec.rb
+++ b/spec/finders/packages/go/module_finder_spec.rb
@@ -5,6 +5,7 @@ require 'spec_helper'
 RSpec.describe Packages::Go::ModuleFinder do
   let_it_be(:project) { create :project }
   let_it_be(:other_project) { create :project }
+
   let(:finder) { described_class.new project, module_name }
 
   shared_examples 'an invalid path' do
diff --git a/spec/finders/packages/group_packages_finder_spec.rb b/spec/finders/packages/group_packages_finder_spec.rb
index 29b2f0fffd7..d7f62bdfbb4 100644
--- a/spec/finders/packages/group_packages_finder_spec.rb
+++ b/spec/finders/packages/group_packages_finder_spec.rb
@@ -129,6 +129,7 @@ RSpec.describe Packages::GroupPackagesFinder do
 
       context 'with package_name' do
         let_it_be(:named_package) { create(:maven_package, project: project, name: 'maven') }
+
         let(:params) { { package_name: package_name } }
 
         context 'as complete name' do
diff --git a/spec/finders/packages/nuget/package_finder_spec.rb b/spec/finders/packages/nuget/package_finder_spec.rb
index 59cca2d06dc..4ad02ce7da8 100644
--- a/spec/finders/packages/nuget/package_finder_spec.rb
+++ b/spec/finders/packages/nuget/package_finder_spec.rb
@@ -11,6 +11,7 @@ RSpec.describe Packages::Nuget::PackageFinder do
   let_it_be(:package3) { create(:nuget_package, name: 'Another.Dummy.Package', project: project) }
   let_it_be(:other_package_1) { create(:nuget_package, name: package1.name, version: package1.version) }
   let_it_be(:other_package_2) { create(:nuget_package, name: package1.name, version: package2.version) }
+
   let(:package_name) { package1.name }
   let(:package_version) { nil }
   let(:limit) { 50 }
@@ -57,6 +58,7 @@ RSpec.describe Packages::Nuget::PackageFinder do
         let_it_be(:package4) { create(:nuget_package, name: package1.name, project: project) }
         let_it_be(:package5) { create(:nuget_package, name: package1.name, project: project) }
         let_it_be(:package6) { create(:nuget_package, name: package1.name, project: project) }
+
         let(:limit) { 2 }
 
         it { is_expected.to match_array([package5, package6]) }
diff --git a/spec/finders/packages/package_file_finder_spec.rb b/spec/finders/packages/package_file_finder_spec.rb
index ab58f75fcae..8014f04d917 100644
--- a/spec/finders/packages/package_file_finder_spec.rb
+++ b/spec/finders/packages/package_file_finder_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 RSpec.describe Packages::PackageFileFinder do
   let_it_be(:package) { create(:maven_package) }
   let_it_be(:package_file) { package.package_files.first }
+
   let(:package_file_name) { package_file.file_name }
   let(:params) { {} }
 
diff --git a/spec/finders/packages/package_finder_spec.rb b/spec/finders/packages/package_finder_spec.rb
index 2bb4f05a41d..1b0c88a4771 100644
--- a/spec/finders/packages/package_finder_spec.rb
+++ b/spec/finders/packages/package_finder_spec.rb
@@ -25,6 +25,7 @@ RSpec.describe ::Packages::PackageFinder do
 
     context 'processing packages' do
       let_it_be(:nuget_package) { create(:nuget_package, :processing, project: project) }
+
       let(:package_id) { nuget_package.id }
 
       it 'are not returned' do
diff --git a/spec/finders/template_finder_spec.rb b/spec/finders/template_finder_spec.rb
index b7339288c51..97eecf8a89d 100644
--- a/spec/finders/template_finder_spec.rb
+++ b/spec/finders/template_finder_spec.rb
@@ -123,6 +123,7 @@ RSpec.describe TemplateFinder do
 
   describe '#execute' do
     let_it_be(:project) { nil }
+
     let(:params) { {} }
 
     subject(:result) { described_class.new(type, project, params).execute }
@@ -149,6 +150,7 @@ RSpec.describe TemplateFinder do
 
   describe '#template_names' do
     let_it_be(:project) { nil }
+
     let(:params) { {} }
 
     subject(:result) { described_class.new(type, project, params).template_names.values.flatten.map { |el| OpenStruct.new(el) } }
diff --git a/spec/finders/todos_finder_spec.rb b/spec/finders/todos_finder_spec.rb
index 577ad80ede1..5611a67e977 100644
--- a/spec/finders/todos_finder_spec.rb
+++ b/spec/finders/todos_finder_spec.rb
@@ -9,6 +9,7 @@ RSpec.describe TodosFinder do
     let_it_be(:project) { create(:project, :repository, namespace: group) }
     let_it_be(:issue) { create(:issue, project: project) }
     let_it_be(:merge_request) { create(:merge_request, source_project: project) }
+
     let(:finder) { described_class }
 
     before_all do
@@ -153,6 +154,7 @@ RSpec.describe TodosFinder do
         context 'by groups' do
           context 'with subgroups' do
             let_it_be(:subgroup) { create(:group, parent: group) }
+
             let!(:todo3) { create(:todo, user: user, group: subgroup, target: issue) }
 
             it 'returns todos from subgroups when filtered by a group' do
diff --git a/spec/finders/user_recent_events_finder_spec.rb b/spec/finders/user_recent_events_finder_spec.rb
index 5a9243d150d..74c563b9bf6 100644
--- a/spec/finders/user_recent_events_finder_spec.rb
+++ b/spec/finders/user_recent_events_finder_spec.rb
@@ -12,6 +12,7 @@ RSpec.describe UserRecentEventsFinder do
   let!(:internal_event)  { create(:event, project: internal_project, author: project_owner) }
   let!(:public_event)    { create(:event, project: public_project, author: project_owner) }
   let_it_be(:issue) { create(:issue, project: public_project) }
+
   let(:limit) { nil }
   let(:params) { { limit: limit } }
 
@@ -43,6 +44,7 @@ RSpec.describe UserRecentEventsFinder do
     context 'events from multiple users' do
       let_it_be(:second_user, reload: true) { create(:user) }
       let_it_be(:private_project_second_user) { create(:project, :private, creator: second_user) }
+
       let(:internal_project_second_user) { create(:project, :internal, creator: second_user) }
       let(:public_project_second_user)   { create(:project, :public, creator: second_user) }
       let!(:private_event_second_user)   { create(:event, project: private_project_second_user, author: second_user) }