From d81f7fc0b3c75a7c95528f21d55be2dd26521f2e Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 28 Jun 2022 09:09:38 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 spec/serializers/cluster_entity_spec.rb     | 31 -------------------
 spec/serializers/environment_entity_spec.rb | 48 -----------------------------
 2 files changed, 79 deletions(-)

(limited to 'spec/serializers')

diff --git a/spec/serializers/cluster_entity_spec.rb b/spec/serializers/cluster_entity_spec.rb
index 514828e3c69..93003e75c0c 100644
--- a/spec/serializers/cluster_entity_spec.rb
+++ b/spec/serializers/cluster_entity_spec.rb
@@ -56,37 +56,6 @@ RSpec.describe ClusterEntity do
       end
     end
 
-    context 'gitlab_managed_apps_logs_path' do
-      let(:cluster) { create(:cluster, :project) }
-      let(:user) { create(:user) }
-
-      subject { described_class.new(cluster, request: request).as_json }
-
-      before do
-        allow_next_instance_of(Clusters::ClusterPresenter) do |presenter|
-          allow(presenter).to receive(:show_path).and_return(nil)
-        end
-      end
-
-      it 'return projects log explorer path' do
-        log_explorer_path = project_logs_path(cluster.project, cluster_id: cluster.id)
-
-        expect_next_instance_of(Clusters::ClusterPresenter, cluster, current_user: user) do |presenter|
-          expect(presenter).to receive(:gitlab_managed_apps_logs_path).and_return(log_explorer_path)
-        end
-
-        expect(subject[:gitlab_managed_apps_logs_path]).to eq(log_explorer_path)
-      end
-
-      context 'when feature is disabled' do
-        before do
-          stub_feature_flags(monitor_logging: false)
-        end
-
-        specify { is_expected.not_to include(:gitlab_managed_apps_logs_path) }
-      end
-    end
-
     context 'enable_advanced_logs_querying' do
       let(:cluster) { create(:cluster, :project) }
       let(:user) { create(:user) }
diff --git a/spec/serializers/environment_entity_spec.rb b/spec/serializers/environment_entity_spec.rb
index 9b6a293da16..cbe32600941 100644
--- a/spec/serializers/environment_entity_spec.rb
+++ b/spec/serializers/environment_entity_spec.rb
@@ -133,54 +133,6 @@ RSpec.describe EnvironmentEntity do
     end
   end
 
-  context 'pod_logs' do
-    context 'with reporter access' do
-      before do
-        project.add_reporter(user)
-      end
-
-      it 'does not expose logs keys' do
-        expect(subject).not_to include(:logs_path)
-        expect(subject).not_to include(:logs_api_path)
-        expect(subject).not_to include(:enable_advanced_logs_querying)
-      end
-    end
-
-    context 'with developer access' do
-      before do
-        project.add_developer(user)
-      end
-
-      it 'exposes logs keys' do
-        expect(subject).to include(:logs_path)
-        expect(subject).to include(:logs_api_path)
-        expect(subject).to include(:enable_advanced_logs_querying)
-      end
-
-      it 'uses k8s api when ES is not available' do
-        expect(subject[:logs_api_path]).to eq(k8s_project_logs_path(project, environment_name: environment.name, format: :json))
-      end
-
-      it 'uses ES api when ES is available' do
-        allow(environment).to receive(:elastic_stack_available?).and_return(true)
-
-        expect(subject[:logs_api_path]).to eq(elasticsearch_project_logs_path(project, environment_name: environment.name, format: :json))
-      end
-
-      context 'with feature flag disabled' do
-        before do
-          stub_feature_flags(monitor_logging: false)
-        end
-
-        it 'does not expose logs keys' do
-          expect(subject).not_to include(:logs_path)
-          expect(subject).not_to include(:logs_api_path)
-          expect(subject).not_to include(:enable_advanced_logs_querying)
-        end
-      end
-    end
-  end
-
   context 'with deployment service ready' do
     before do
       allow(environment).to receive(:has_terminals?).and_return(true)
-- 
cgit v1.2.3