Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc2

18 files changed, 71 insertions, 91 deletions

diff --git a/spec/services/clusters/applications/create_service_spec.rb b/spec/services/clusters/applications/create_service_spec.rb
index f93ae2c62f3..f3b420510a6 100644
--- a/spec/services/clusters/applications/create_service_spec.rb
+++ b/spec/services/clusters/applications/create_service_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Clusters::Applications::CreateService do
 
   let(:cluster) { create(:cluster, :project, :provided_by_gcp) }
   let(:user) { create(:user) }
-  let(:params) { { application: 'helm' } }
+  let(:params) { { application: 'ingress' } }
   let(:service) { described_class.new(cluster, user, params) }
 
   describe '#execute' do
@@ -23,16 +23,16 @@ RSpec.describe Clusters::Applications::CreateService do
         subject
 
         cluster.reload
-      end.to change(cluster, :application_helm)
+      end.to change(cluster, :application_ingress)
     end
 
     context 'application already installed' do
-      let!(:application) { create(:clusters_applications_helm, :installed, cluster: cluster) }
+      let!(:application) { create(:clusters_applications_ingress, :installed, cluster: cluster) }
 
       it 'does not create a new application' do
         expect do
           subject
-        end.not_to change(Clusters::Applications::Helm, :count)
+        end.not_to change(Clusters::Applications::Ingress, :count)
       end
 
       it 'schedules an upgrade for the application' do
@@ -43,10 +43,6 @@ RSpec.describe Clusters::Applications::CreateService do
     end
 
     context 'known applications' do
-      before do
-        create(:clusters_applications_helm, :installed, cluster: cluster)
-      end
-
       context 'ingress application' do
         let(:params) do
           {
@@ -215,19 +211,17 @@ RSpec.describe Clusters::Applications::CreateService do
 
       using RSpec::Parameterized::TableSyntax
 
-      where(:application, :association, :allowed, :pre_create_helm, :pre_create_ingress) do
-        'helm'       | :application_helm       | true | false | false
-        'ingress'    | :application_ingress    | true | true | false
-        'runner'     | :application_runner     | true | true | false
-        'prometheus' | :application_prometheus | true | true | false
-        'jupyter'    | :application_jupyter    | true | true | true
+      where(:application, :association, :allowed, :pre_create_ingress) do
+        'ingress'    | :application_ingress    | true | false
+        'runner'     | :application_runner     | true | false
+        'prometheus' | :application_prometheus | true | false
+        'jupyter'    | :application_jupyter    | true | true
       end
 
       with_them do
         before do
           klass = "Clusters::Applications::#{application.titleize}"
           allow_any_instance_of(klass.constantize).to receive(:make_scheduled!).and_call_original
-          create(:clusters_applications_helm, :installed, cluster: cluster) if pre_create_helm
           create(:clusters_applications_ingress, :installed, cluster: cluster, external_hostname: 'example.com') if pre_create_ingress
         end
 
@@ -252,7 +246,7 @@ RSpec.describe Clusters::Applications::CreateService do
         it 'makes the application scheduled' do
           expect do
             subject
-          end.to change { Clusters::Applications::Helm.with_status(:scheduled).count }.by(1)
+          end.to change { Clusters::Applications::Ingress.with_status(:scheduled).count }.by(1)
         end
 
         it 'schedules an install via worker' do
@@ -266,7 +260,7 @@ RSpec.describe Clusters::Applications::CreateService do
       end
 
       context 'when application is associated with a cluster' do
-        let(:application) { create(:clusters_applications_helm, :installable, cluster: cluster) }
+        let(:application) { create(:clusters_applications_ingress, :installable, cluster: cluster) }
         let(:worker_arguments) { [application.name, application.id] }
 
         it_behaves_like 'installable applications'
@@ -280,7 +274,7 @@ RSpec.describe Clusters::Applications::CreateService do
     end
 
     context 'when installation is already in progress' do
-      let!(:application) { create(:clusters_applications_helm, :installing, cluster: cluster) }
+      let!(:application) { create(:clusters_applications_ingress, :installing, cluster: cluster) }
 
       it 'raises an exception' do
         expect { subject }
@@ -295,7 +289,7 @@ RSpec.describe Clusters::Applications::CreateService do
 
     context 'when application is installed' do
       %i(installed updated).each do |status|
-        let(:application) { create(:clusters_applications_helm, status, cluster: cluster) }
+        let(:application) { create(:clusters_applications_ingress, status, cluster: cluster) }
 
         it 'schedules an upgrade via worker' do
           expect(ClusterUpgradeAppWorker)
diff --git a/spec/services/clusters/aws/fetch_credentials_service_spec.rb b/spec/services/clusters/aws/fetch_credentials_service_spec.rb
index 361a947f634..4b9458d277b 100644
--- a/spec/services/clusters/aws/fetch_credentials_service_spec.rb
+++ b/spec/services/clusters/aws/fetch_credentials_service_spec.rb
@@ -60,9 +60,7 @@ RSpec.describe Clusters::Aws::FetchCredentialsService do
         subject { described_class.new(provision_role, provider: provider).execute }
 
         before do
-          allow(File).to receive(:read)
-            .with(Rails.root.join('vendor', 'aws', 'iam', 'eks_cluster_read_only_policy.json'))
-            .and_return(session_policy)
+          stub_file_read(Rails.root.join('vendor', 'aws', 'iam', 'eks_cluster_read_only_policy.json'), content: session_policy)
         end
 
         it { is_expected.to eq assumed_role_credentials }
diff --git a/spec/services/clusters/aws/provision_service_spec.rb b/spec/services/clusters/aws/provision_service_spec.rb
index 52612e5ac40..5efac29ec1e 100644
--- a/spec/services/clusters/aws/provision_service_spec.rb
+++ b/spec/services/clusters/aws/provision_service_spec.rb
@@ -42,9 +42,7 @@ RSpec.describe Clusters::Aws::ProvisionService do
       allow(provider).to receive(:api_client)
         .and_return(client)
 
-      allow(File).to receive(:read)
-        .with(Rails.root.join('vendor', 'aws', 'cloudformation', 'eks_cluster.yaml'))
-        .and_return(cloudformation_template)
+      stub_file_read(Rails.root.join('vendor', 'aws', 'cloudformation', 'eks_cluster.yaml'), content: cloudformation_template)
     end
 
     it 'updates the provider status to :creating and configures the provider with credentials' do
diff --git a/spec/services/clusters/cleanup/app_service_spec.rb b/spec/services/clusters/cleanup/app_service_spec.rb
index ba1be7448a4..ea1194d2100 100644
--- a/spec/services/clusters/cleanup/app_service_spec.rb
+++ b/spec/services/clusters/cleanup/app_service_spec.rb
@@ -67,7 +67,8 @@ RSpec.describe Clusters::Cleanup::AppService do
 
         it 'only uninstalls apps that are not dependencies for other installed apps' do
           expect(Clusters::Applications::UninstallWorker)
-            .not_to receive(:perform_async).with(helm.name, helm.id)
+            .to receive(:perform_async).with(helm.name, helm.id)
+            .and_call_original
 
           expect(Clusters::Applications::UninstallWorker)
             .not_to receive(:perform_async).with(ingress.name, ingress.id)
@@ -85,7 +86,7 @@ RSpec.describe Clusters::Cleanup::AppService do
 
         it 'logs application uninstalls and next execution' do
           expect(logger).to receive(:info)
-            .with(log_meta.merge(event: :uninstalling_app, application: kind_of(String))).twice
+            .with(log_meta.merge(event: :uninstalling_app, application: kind_of(String))).exactly(3).times
           expect(logger).to receive(:info)
             .with(log_meta.merge(event: :scheduling_execution, next_execution: 1))
 
diff --git a/spec/services/event_create_service_spec.rb b/spec/services/event_create_service_spec.rb
index 3c67c15f10a..17b2c7b38e1 100644
--- a/spec/services/event_create_service_spec.rb
+++ b/spec/services/event_create_service_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe EventCreateService do
       tracking_params = { event_action: event_action, date_from: Date.yesterday, date_to: Date.today }
 
       expect { subject }
-        .to change { Gitlab::UsageDataCounters::TrackUniqueEvents.count_unique_events(tracking_params) }
+        .to change { Gitlab::UsageDataCounters::TrackUniqueEvents.count_unique_events(**tracking_params) }
         .by(1)
     end
   end
@@ -386,7 +386,7 @@ RSpec.describe EventCreateService do
         counter_class = Gitlab::UsageDataCounters::TrackUniqueEvents
         tracking_params = { event_action: event_action, date_from: Date.yesterday, date_to: Date.today }
 
-        expect { subject }.not_to change { counter_class.count_unique_events(tracking_params) }
+        expect { subject }.not_to change { counter_class.count_unique_events(**tracking_params) }
       end
     end
   end
diff --git a/spec/services/metrics/dashboard/clone_dashboard_service_spec.rb b/spec/services/metrics/dashboard/clone_dashboard_service_spec.rb
index 728b343b801..b326fc1726d 100644
--- a/spec/services/metrics/dashboard/clone_dashboard_service_spec.rb
+++ b/spec/services/metrics/dashboard/clone_dashboard_service_spec.rb
@@ -146,7 +146,7 @@ RSpec.describe Metrics::Dashboard::CloneDashboardService, :use_clean_rails_memor
         it 'extends dashboard template path to absolute url' do
           allow(::Files::CreateService).to receive(:new).and_return(double(execute: { status: :success }))
 
-          expect(File).to receive(:read).with(Rails.root.join('config/prometheus/common_metrics.yml')).and_return('')
+          expect_file_read(Rails.root.join('config/prometheus/common_metrics.yml'), content: '')
 
           service_call
         end
diff --git a/spec/services/projects/fork_service_spec.rb b/spec/services/projects/fork_service_spec.rb
index 555f2f5a5e5..6eadcc48d5b 100644
--- a/spec/services/projects/fork_service_spec.rb
+++ b/spec/services/projects/fork_service_spec.rb
@@ -344,10 +344,6 @@ RSpec.describe Projects::ForkService do
     let(:fork_from_project) { create(:project, :public) }
     let(:forker) { create(:user) }
 
-    before do
-      stub_feature_flags(object_pools: true)
-    end
-
     context 'when no pool exists' do
       it 'creates a new object pool' do
         forked_project = fork_project(fork_from_project, forker, using_service: true)
diff --git a/spec/services/projects/move_access_service_spec.rb b/spec/services/projects/move_access_service_spec.rb
index 02f80988dd1..90167ffebed 100644
--- a/spec/services/projects/move_access_service_spec.rb
+++ b/spec/services/projects/move_access_service_spec.rb
@@ -91,7 +91,7 @@ RSpec.describe Projects::MoveAccessService do
       it 'does not remove remaining memberships' do
         target_project.add_maintainer(maintainer_user)
 
-        subject.execute(project_with_access, options)
+        subject.execute(project_with_access, **options)
 
         expect(project_with_access.project_members.count).not_to eq 0
       end
@@ -99,7 +99,7 @@ RSpec.describe Projects::MoveAccessService do
       it 'does not remove remaining group links' do
         target_project.project_group_links.create!(group: maintainer_group, group_access: Gitlab::Access::MAINTAINER)
 
-        subject.execute(project_with_access, options)
+        subject.execute(project_with_access, **options)
 
         expect(project_with_access.project_group_links.count).not_to eq 0
       end
@@ -107,7 +107,7 @@ RSpec.describe Projects::MoveAccessService do
       it 'does not remove remaining authorizations' do
         target_project.add_developer(developer_user)
 
-        subject.execute(project_with_access, options)
+        subject.execute(project_with_access, **options)
 
         expect(project_with_access.project_authorizations.count).not_to eq 0
       end
diff --git a/spec/services/projects/move_deploy_keys_projects_service_spec.rb b/spec/services/projects/move_deploy_keys_projects_service_spec.rb
index e69b4dd4fc7..bd93b80f712 100644
--- a/spec/services/projects/move_deploy_keys_projects_service_spec.rb
+++ b/spec/services/projects/move_deploy_keys_projects_service_spec.rb
@@ -51,7 +51,7 @@ RSpec.describe Projects::MoveDeployKeysProjectsService do
       it 'does not remove remaining deploy keys projects' do
         target_project.deploy_keys << project_with_deploy_keys.deploy_keys.first
 
-        subject.execute(project_with_deploy_keys, options)
+        subject.execute(project_with_deploy_keys, **options)
 
         expect(project_with_deploy_keys.deploy_keys_projects.count).not_to eq 0
       end
diff --git a/spec/services/projects/move_lfs_objects_projects_service_spec.rb b/spec/services/projects/move_lfs_objects_projects_service_spec.rb
index b73286fba9a..e3df5fed9cf 100644
--- a/spec/services/projects/move_lfs_objects_projects_service_spec.rb
+++ b/spec/services/projects/move_lfs_objects_projects_service_spec.rb
@@ -48,7 +48,7 @@ RSpec.describe Projects::MoveLfsObjectsProjectsService do
       it 'does not remove remaining lfs objects' do
         target_project.lfs_objects << project_with_lfs_objects.lfs_objects.first(2)
 
-        subject.execute(project_with_lfs_objects, options)
+        subject.execute(project_with_lfs_objects, **options)
 
         expect(project_with_lfs_objects.lfs_objects.count).not_to eq 0
       end
diff --git a/spec/services/projects/move_notification_settings_service_spec.rb b/spec/services/projects/move_notification_settings_service_spec.rb
index 7c9f1dd30d2..e381ae7590f 100644
--- a/spec/services/projects/move_notification_settings_service_spec.rb
+++ b/spec/services/projects/move_notification_settings_service_spec.rb
@@ -49,7 +49,7 @@ RSpec.describe Projects::MoveNotificationSettingsService do
       let(:options) { { remove_remaining_elements: false } }
 
       it 'does not remove remaining notification settings' do
-        subject.execute(project_with_notifications, options)
+        subject.execute(project_with_notifications, **options)
 
         expect(project_with_notifications.notification_settings.count).not_to eq 0
       end
diff --git a/spec/services/projects/move_project_authorizations_service_spec.rb b/spec/services/projects/move_project_authorizations_service_spec.rb
index a37b4d807a0..d47b13ca939 100644
--- a/spec/services/projects/move_project_authorizations_service_spec.rb
+++ b/spec/services/projects/move_project_authorizations_service_spec.rb
@@ -49,7 +49,7 @@ RSpec.describe Projects::MoveProjectAuthorizationsService do
         target_project.add_maintainer(developer_user)
         target_project.add_developer(reporter_user)
 
-        subject.execute(project_with_users, options)
+        subject.execute(project_with_users, **options)
 
         expect(project_with_users.project_authorizations.count).not_to eq 0
       end
diff --git a/spec/services/projects/move_project_group_links_service_spec.rb b/spec/services/projects/move_project_group_links_service_spec.rb
index 6304eded8d3..1fca96a0367 100644
--- a/spec/services/projects/move_project_group_links_service_spec.rb
+++ b/spec/services/projects/move_project_group_links_service_spec.rb
@@ -58,7 +58,7 @@ RSpec.describe Projects::MoveProjectGroupLinksService do
         target_project.project_group_links.create!(group: maintainer_group, group_access: Gitlab::Access::MAINTAINER)
         target_project.project_group_links.create!(group: developer_group, group_access: Gitlab::Access::DEVELOPER)
 
-        subject.execute(project_with_groups, options)
+        subject.execute(project_with_groups, **options)
 
         expect(project_with_groups.project_group_links.count).not_to eq 0
       end
diff --git a/spec/services/projects/move_project_members_service_spec.rb b/spec/services/projects/move_project_members_service_spec.rb
index f14f00e3866..8fbd0ba3270 100644
--- a/spec/services/projects/move_project_members_service_spec.rb
+++ b/spec/services/projects/move_project_members_service_spec.rb
@@ -58,7 +58,7 @@ RSpec.describe Projects::MoveProjectMembersService do
         target_project.add_maintainer(developer_user)
         target_project.add_developer(reporter_user)
 
-        subject.execute(project_with_users, options)
+        subject.execute(project_with_users, **options)
 
         expect(project_with_users.project_members.count).not_to eq 0
       end
diff --git a/spec/services/projects/open_issues_count_service_spec.rb b/spec/services/projects/open_issues_count_service_spec.rb
index 294c9adcc92..c739fea5ecf 100644
--- a/spec/services/projects/open_issues_count_service_spec.rb
+++ b/spec/services/projects/open_issues_count_service_spec.rb
@@ -10,14 +10,6 @@ RSpec.describe Projects::OpenIssuesCountService, :use_clean_rails_memory_store_c
   it_behaves_like 'a counter caching service'
 
   describe '#count' do
-    it 'does not count test cases' do
-      create(:issue, :opened, project: project)
-      create(:incident, :opened, project: project)
-      create(:quality_test_case, :opened, project: project)
-
-      expect(described_class.new(project).count).to eq(2)
-    end
-
     context 'when user is nil' do
       it 'does not include confidential issues in the issue count' do
         create(:issue, :opened, project: project)
diff --git a/spec/services/projects/update_pages_service_spec.rb b/spec/services/projects/update_pages_service_spec.rb
index d2c6c0eb971..0b12a0c14e4 100644
--- a/spec/services/projects/update_pages_service_spec.rb
+++ b/spec/services/projects/update_pages_service_spec.rb
@@ -105,16 +105,6 @@ RSpec.describe Projects::UpdatePagesService do
         end
       end
 
-      it 'does not create deployment when zip_pages_deployments feature flag is disabled' do
-        stub_feature_flags(zip_pages_deployments: false)
-
-        expect do
-          expect(execute).to eq(:success)
-        end.not_to change { project.pages_deployments.count }
-
-        expect(project.pages_metadatum.reload.pages_deployment_id).to be_nil
-      end
-
       it 'limits pages size' do
         stub_application_setting(max_pages_size: 1)
         expect(execute).not_to eq(:success)
diff --git a/spec/services/releases/create_service_spec.rb b/spec/services/releases/create_service_spec.rb
index b9294182883..7287825a0be 100644
--- a/spec/services/releases/create_service_spec.rb
+++ b/spec/services/releases/create_service_spec.rb
@@ -167,28 +167,47 @@ RSpec.describe Releases::CreateService do
       end
     end
 
-    context 'when no milestone is passed in' do
-      it 'creates a release without a milestone tied to it' do
-        expect(params.key?(:milestones)).to be_falsey
+    context 'no milestone association behavior' do
+      let(:title_1) { 'v1.0' }
+      let(:title_2) { 'v1.0-rc' }
+      let!(:milestone_1) { create(:milestone, :active, project: project, title: title_1) }
+      let!(:milestone_2) { create(:milestone, :active, project: project, title: title_2) }
 
-        service.execute
-        release = project.releases.last
+      context 'when no milestones parameter is passed' do
+        it 'creates a release without a milestone tied to it' do
+          expect(service.param_for_milestone_titles_provided?).to be_falsey
 
-        expect(release.milestones).to be_empty
+          service.execute
+          release = project.releases.last
+
+          expect(release.milestones).to be_empty
+        end
+
+        it 'does not create any new MilestoneRelease object' do
+          expect { service.execute }.not_to change { MilestoneRelease.count }
+        end
       end
 
-      it 'does not create any new MilestoneRelease object' do
-        expect { service.execute }.not_to change { MilestoneRelease.count }
+      context 'when an empty array is passed as the milestones parameter' do
+        it 'creates a release without a milestone tied to it' do
+          service = described_class.new(project, user, params.merge!({ milestones: [] }))
+          service.execute
+          release = project.releases.last
+
+          expect(release.milestones).to be_empty
+        end
       end
-    end
 
-    context 'when an empty value is passed as a milestone' do
-      it 'creates a release without a milestone tied to it' do
-        service = described_class.new(project, user, params.merge!({ milestones: [] }))
-        service.execute
-        release = project.releases.last
+      context 'when nil is passed as the milestones parameter' do
+        it 'creates a release without a milestone tied to it' do
+          expect(service.param_for_milestone_titles_provided?).to be_falsey
 
-        expect(release.milestones).to be_empty
+          service = described_class.new(project, user, params.merge!({ milestones: nil }))
+          service.execute
+          release = project.releases.last
+
+          expect(release.milestones).to be_empty
+        end
       end
     end
   end
@@ -217,7 +236,7 @@ RSpec.describe Releases::CreateService do
       let(:released_at) { 3.weeks.ago }
 
       it 'does not execute CreateEvidenceWorker' do
-        expect { subject }.not_to change(CreateEvidenceWorker.jobs, :size)
+        expect { subject }.not_to change(Releases::CreateEvidenceWorker.jobs, :size)
       end
 
       it 'does not create an Evidence object', :sidekiq_inline do
@@ -316,7 +335,7 @@ RSpec.describe Releases::CreateService do
       end
 
       it 'queues CreateEvidenceWorker' do
-        expect { subject }.to change(CreateEvidenceWorker.jobs, :size).by(1)
+        expect { subject }.to change(Releases::CreateEvidenceWorker.jobs, :size).by(1)
       end
 
       it 'creates Evidence', :sidekiq_inline do
@@ -341,18 +360,12 @@ RSpec.describe Releases::CreateService do
     context 'upcoming release' do
       let(:released_at) { 1.day.from_now }
 
-      it 'queues CreateEvidenceWorker' do
-        expect { subject }.to change(CreateEvidenceWorker.jobs, :size).by(1)
-      end
-
-      it 'queues CreateEvidenceWorker at the released_at timestamp' do
-        subject
-
-        expect(CreateEvidenceWorker.jobs.last['at'].to_i).to eq(released_at.to_i)
+      it 'does not execute CreateEvidenceWorker' do
+        expect { subject }.not_to change(Releases::CreateEvidenceWorker.jobs, :size)
       end
 
-      it 'creates Evidence', :sidekiq_inline do
-        expect { subject }.to change(Releases::Evidence, :count).by(1)
+      it 'does not create an Evidence object', :sidekiq_inline do
+        expect { subject }.not_to change(Releases::Evidence, :count)
       end
 
       it 'is not a historical release' do
@@ -366,8 +379,6 @@ RSpec.describe Releases::CreateService do
 
         expect(last_release.upcoming_release?).to be_truthy
       end
-
-      include_examples 'uses the right pipeline for evidence'
     end
   end
 end
diff --git a/spec/services/suggestions/apply_service_spec.rb b/spec/services/suggestions/apply_service_spec.rb
index d8ade0fbbda..3e7594bd30f 100644
--- a/spec/services/suggestions/apply_service_spec.rb
+++ b/spec/services/suggestions/apply_service_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe Suggestions::ApplyService do
     position_args = args.slice(:old_path, :new_path, :old_line, :new_line)
     content_args = args.slice(:from_content, :to_content)
 
-    position = build_position(position_args)
+    position = build_position(**position_args)
 
     diff_note = create(:diff_note_on_merge_request,
                        noteable: merge_request,