Add latest changes from gitlab-org/gitlab@master

3 files changed, 2 insertions, 97 deletions

diff --git a/spec/serializers/cluster_application_entity_spec.rb b/spec/serializers/cluster_application_entity_spec.rb
deleted file mode 100644
index 1e71e45948c..00000000000
--- a/spec/serializers/cluster_application_entity_spec.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe ClusterApplicationEntity do
-  describe '#as_json' do
-    let(:application) { build(:clusters_applications_helm, version: '0.1.1') }
-
-    subject { described_class.new(application).as_json }
-
-    it 'has name' do
-      expect(subject[:name]).to eq(application.name)
-    end
-
-    it 'has status' do
-      expect(subject[:status]).to eq(:not_installable)
-    end
-
-    it 'has version' do
-      expect(subject[:version]).to eq('0.1.1')
-    end
-
-    it 'has no status_reason' do
-      expect(subject[:status_reason]).to be_nil
-    end
-
-    it 'has can_uninstall' do
-      expect(subject[:can_uninstall]).to be_truthy
-    end
-
-    context 'non-helm application' do
-      let(:application) { build(:clusters_applications_runner, version: '0.0.0') }
-
-      it 'has update_available' do
-        expect(subject[:update_available]).to be_truthy
-      end
-    end
-
-    context 'when application is errored' do
-      let(:application) { build(:clusters_applications_helm, :errored) }
-
-      it 'has corresponded data' do
-        expect(subject[:status]).to eq(:errored)
-        expect(subject[:status_reason]).not_to be_nil
-        expect(subject[:status_reason]).to eq(application.status_reason)
-      end
-    end
-
-    context 'for ingress application' do
-      let(:application) do
-        build(
-          :clusters_applications_ingress,
-          :installed,
-          external_ip: '111.222.111.222'
-        )
-      end
-
-      it 'includes external_ip' do
-        expect(subject[:external_ip]).to eq('111.222.111.222')
-      end
-    end
-
-    context 'for knative application' do
-      let(:pages_domain) { create(:pages_domain, :instance_serverless) }
-      let(:application) { build(:clusters_applications_knative, :installed) }
-
-      before do
-        create(:serverless_domain_cluster, knative: application, pages_domain: pages_domain)
-      end
-
-      it 'includes available domains' do
-        expect(subject[:available_domains].length).to eq(1)
-        expect(subject[:available_domains].first).to eq(id: pages_domain.id, domain: pages_domain.domain)
-      end
-
-      it 'includes pages_domain' do
-        expect(subject[:pages_domain]).to eq(id: pages_domain.id, domain: pages_domain.domain)
-      end
-    end
-  end
-end
diff --git a/spec/serializers/cluster_entity_spec.rb b/spec/serializers/cluster_entity_spec.rb
index 2de27deeffe..ff1a9a4feac 100644
--- a/spec/serializers/cluster_entity_spec.rb
+++ b/spec/serializers/cluster_entity_spec.rb
@@ -41,19 +41,5 @@ RSpec.describe ClusterEntity do
         expect(subject[:status_reason]).to be_nil
       end
     end
-
-    context 'when no application has been installed' do
-      let(:cluster) { create(:cluster, :instance) }
-
-      subject { described_class.new(cluster, request: request).as_json[:applications] }
-
-      it 'contains helm as not_installable' do
-        expect(subject).not_to be_empty
-
-        helm = subject[0]
-        expect(helm[:name]).to eq('helm')
-        expect(helm[:status]).to eq(:not_installable)
-      end
-    end
   end
 end
diff --git a/spec/serializers/cluster_serializer_spec.rb b/spec/serializers/cluster_serializer_spec.rb
index 7ec6d3c8bb8..cf102e11b90 100644
--- a/spec/serializers/cluster_serializer_spec.rb
+++ b/spec/serializers/cluster_serializer_spec.rb
@@ -34,13 +34,13 @@ RSpec.describe ClusterSerializer do
       end
 
       it 'serializes attrs correctly' do
-        is_expected.to contain_exactly(:status, :status_reason, :applications)
+        is_expected.to contain_exactly(:status, :status_reason)
       end
     end
 
     context 'when provider type is user' do
       it 'serializes attrs correctly' do
-        is_expected.to contain_exactly(:status, :status_reason, :applications)
+        is_expected.to contain_exactly(:status, :status_reason)
       end
     end
   end