Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

5 files changed, 3 insertions, 211 deletions

diff --git a/spec/presenters/blob_presenter_spec.rb b/spec/presenters/blob_presenter_spec.rb
index 7b7463e6abc..498b2a32a0e 100644
--- a/spec/presenters/blob_presenter_spec.rb
+++ b/spec/presenters/blob_presenter_spec.rb
@@ -106,7 +106,7 @@ RSpec.describe BlobPresenter do
   end
 
   describe '#find_file_path' do
-    it { expect(presenter.find_file_path).to eq("/#{project.full_path}/-/find_file/HEAD/files/ruby/regex.rb") }
+    it { expect(presenter.find_file_path).to eq("/#{project.full_path}/-/find_file/HEAD") }
   end
 
   describe '#blame_path' do
diff --git a/spec/presenters/ci/build_presenter_spec.rb b/spec/presenters/ci/build_presenter_spec.rb
index 1ff2ea3d225..6bf36a52419 100644
--- a/spec/presenters/ci/build_presenter_spec.rb
+++ b/spec/presenters/ci/build_presenter_spec.rb
@@ -29,36 +29,6 @@ RSpec.describe Ci::BuildPresenter do
     end
   end
 
-  describe '#erased_by_user?' do
-    it 'takes a build and optional params' do
-      expect(presenter).not_to be_erased_by_user
-    end
-  end
-
-  describe '#erased_by_name' do
-    context 'when build is not erased' do
-      before do
-        expect(presenter).to receive(:erased_by_user?).and_return(false)
-      end
-
-      it 'returns nil' do
-        expect(presenter.erased_by_name).to be_nil
-      end
-    end
-
-    context 'when build is erased' do
-      before do
-        expect(presenter).to receive(:erased_by_user?).and_return(true)
-        expect(build).to receive(:erased_by)
-          .and_return(double(:user, name: 'John Doe'))
-      end
-
-      it 'returns the name of the eraser' do
-        expect(presenter.erased_by_name).to eq('John Doe')
-      end
-    end
-  end
-
   describe '#status_title' do
     context 'when build is auto-canceled' do
       before do
@@ -168,58 +138,6 @@ RSpec.describe Ci::BuildPresenter do
     end
   end
 
-  describe '#tooltip_message' do
-    context 'When build has failed' do
-      let(:build) { create(:ci_build, :script_failure, pipeline: pipeline) }
-
-      it 'returns the reason of failure' do
-        tooltip = subject.tooltip_message
-
-        expect(tooltip).to eq("#{build.name} - failed - (script failure)")
-      end
-    end
-
-    context 'When build has failed and retried' do
-      let(:build) { create(:ci_build, :script_failure, :retried, pipeline: pipeline) }
-
-      it 'includes the reason of failure and the retried title' do
-        tooltip = subject.tooltip_message
-
-        expect(tooltip).to eq("#{build.name} - failed - (script failure) (retried)")
-      end
-    end
-
-    context 'When build has failed and is allowed to' do
-      let(:build) { create(:ci_build, :script_failure, :allowed_to_fail, pipeline: pipeline) }
-
-      it 'includes the reason of failure' do
-        tooltip = subject.tooltip_message
-
-        expect(tooltip).to eq("#{build.name} - failed - (script failure) (allowed to fail)")
-      end
-    end
-
-    context 'For any other build (no retried)' do
-      let(:build) { create(:ci_build, :success, pipeline: pipeline) }
-
-      it 'includes build name and status' do
-        tooltip = subject.tooltip_message
-
-        expect(tooltip).to eq("#{build.name} - passed")
-      end
-    end
-
-    context 'For any other build (retried)' do
-      let(:build) { create(:ci_build, :success, :retried, pipeline: pipeline) }
-
-      it 'includes build name and status' do
-        tooltip = subject.tooltip_message
-
-        expect(tooltip).to eq("#{build.name} - passed (retried)")
-      end
-    end
-  end
-
   describe '#execute_in' do
     subject { presenter.execute_in }
 
diff --git a/spec/presenters/ci/legacy_stage_presenter_spec.rb b/spec/presenters/ci/legacy_stage_presenter_spec.rb
deleted file mode 100644
index 5268ef0f246..00000000000
--- a/spec/presenters/ci/legacy_stage_presenter_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Ci::LegacyStagePresenter do
-  let(:legacy_stage) { create(:ci_stage) }
-  let(:presenter) { described_class.new(legacy_stage) }
-
-  let!(:build) { create(:ci_build, :tags, :artifacts, pipeline: legacy_stage.pipeline, stage: legacy_stage.name) }
-  let!(:retried_build) { create(:ci_build, :tags, :artifacts, :retried, pipeline: legacy_stage.pipeline, stage: legacy_stage.name) }
-
-  before do
-    create(:generic_commit_status, pipeline: legacy_stage.pipeline, stage: legacy_stage.name)
-  end
-
-  describe '#latest_ordered_statuses' do
-    subject(:latest_ordered_statuses) { presenter.latest_ordered_statuses }
-
-    it 'preloads build tags' do
-      expect(latest_ordered_statuses.second.association(:tags)).to be_loaded
-    end
-
-    it 'preloads build artifacts archive' do
-      expect(latest_ordered_statuses.second.association(:job_artifacts_archive)).to be_loaded
-    end
-
-    it 'preloads build artifacts metadata' do
-      expect(latest_ordered_statuses.second.association(:metadata)).to be_loaded
-    end
-  end
-
-  describe '#retried_ordered_statuses' do
-    subject(:retried_ordered_statuses) { presenter.retried_ordered_statuses }
-
-    it 'preloads build tags' do
-      expect(retried_ordered_statuses.first.association(:tags)).to be_loaded
-    end
-
-    it 'preloads build artifacts archive' do
-      expect(retried_ordered_statuses.first.association(:job_artifacts_archive)).to be_loaded
-    end
-
-    it 'preloads build artifacts metadata' do
-      expect(retried_ordered_statuses.first.association(:metadata)).to be_loaded
-    end
-  end
-end
diff --git a/spec/presenters/clusters/cluster_presenter_spec.rb b/spec/presenters/clusters/cluster_presenter_spec.rb
index 6570ab56ed0..7349f444fac 100644
--- a/spec/presenters/clusters/cluster_presenter_spec.rb
+++ b/spec/presenters/clusters/cluster_presenter_spec.rb
@@ -148,84 +148,4 @@ RSpec.describe Clusters::ClusterPresenter do
       it_behaves_like 'cluster health data'
     end
   end
-
-  describe '#gitlab_managed_apps_logs_path' do
-    context 'user can read logs' do
-      let(:project) { cluster.project }
-
-      before do
-        project.add_maintainer(user)
-      end
-
-      it 'returns path to logs' do
-        expect(presenter.gitlab_managed_apps_logs_path).to eq k8s_project_logs_path(project, cluster_id: cluster.id, format: :json)
-      end
-
-      context 'cluster has elastic stack integration enabled' do
-        before do
-          create(:clusters_integrations_elastic_stack, cluster: cluster)
-        end
-
-        it 'returns path to logs' do
-          expect(presenter.gitlab_managed_apps_logs_path).to eq elasticsearch_project_logs_path(project, cluster_id: cluster.id, format: :json)
-        end
-      end
-    end
-
-    context 'group cluster' do
-      let(:cluster) { create(:cluster, cluster_type: :group_type, groups: [group]) }
-      let(:group) { create(:group, name: 'Foo') }
-
-      context 'user can read logs' do
-        before do
-          group.add_maintainer(user)
-        end
-
-        context 'there are projects within group' do
-          let!(:project) { create(:project, namespace: group) }
-
-          it 'returns path to logs' do
-            expect(presenter.gitlab_managed_apps_logs_path).to eq k8s_project_logs_path(project, cluster_id: cluster.id, format: :json)
-          end
-        end
-
-        context 'there are no projects within group' do
-          it 'returns nil' do
-            expect(presenter.gitlab_managed_apps_logs_path).to be_nil
-          end
-        end
-      end
-    end
-
-    context 'instance cluster' do
-      let(:cluster) { create(:cluster, cluster_type: :instance_type) }
-      let!(:project) { create(:project) }
-      let(:user) { create(:admin) }
-
-      before do
-        project.add_maintainer(user)
-        stub_application_setting(admin_mode: false)
-      end
-
-      context 'user can read logs' do
-        it 'returns path to logs' do
-          expect(presenter.gitlab_managed_apps_logs_path).to eq k8s_project_logs_path(project, cluster_id: cluster.id, format: :json)
-        end
-      end
-    end
-
-    context 'user can NOT read logs' do
-      let(:cluster) { create(:cluster, cluster_type: :instance_type) }
-      let!(:project) { create(:project) }
-
-      before do
-        project.add_developer(user)
-        stub_application_setting(admin_mode: false)
-      end
-
-      it 'returns nil' do
-        expect(presenter.gitlab_managed_apps_logs_path).to be_nil
-      end
-    end
-  end
 end
diff --git a/spec/presenters/gitlab/blame_presenter_spec.rb b/spec/presenters/gitlab/blame_presenter_spec.rb
index ff128416692..b3b9e133a73 100644
--- a/spec/presenters/gitlab/blame_presenter_spec.rb
+++ b/spec/presenters/gitlab/blame_presenter_spec.rb
@@ -8,8 +8,9 @@ RSpec.describe Gitlab::BlamePresenter do
   let(:commit) { project.commit('master') }
   let(:blob) { project.repository.blob_at(commit.id, path) }
   let(:blame) { Gitlab::Blame.new(blob, commit) }
+  let(:page) { 1 }
 
-  subject { described_class.new(blame, project: project, path: path) }
+  subject { described_class.new(blame, project: project, path: path, page: page) }
 
   it 'precalculates necessary data on init' do
     expect_any_instance_of(described_class)