Merge branch '55103-hide-group-cluster-features' into 'master'

Resolve "Hide cluster features that don't work yet with Group Clusters"

Closes #55103

See merge request gitlab-org/gitlab-ce!23935

(cherry picked from commit a91138baaba93b72c3b487d38e11299e99d2071e)

4ed4a640 Expose environment's cluster type
55bfea0a Disable terminal button for group clusters
bfbea9b8 Use constants for cluster_type
b1fb15f8 Fix formatting
e9c4f190 Add CHANGELOG.md entry for gitlab-ce!23935
0d608a7b Add test for environment_terminal_button
e18fb5b3 Memoize call for EnvironmentEntity#cluster_type
a45fb5d6 Moves memoization to Environment

3 files changed, 64 insertions, 18 deletions

diff --git a/spec/javascripts/environments/environment_terminal_button_spec.js b/spec/javascripts/environments/environment_terminal_button_spec.js
index f1576b19d1b..56e18db59c5 100644
--- a/spec/javascripts/environments/environment_terminal_button_spec.js
+++ b/spec/javascripts/environments/environment_terminal_button_spec.js
@@ -2,30 +2,46 @@ import Vue from 'vue';
 import terminalComp from '~/environments/components/environment_terminal_button.vue';
 
 describe('Stop Component', () => {
-  let TerminalComponent;
   let component;
   const terminalPath = '/path';
 
-  beforeEach(() => {
-    TerminalComponent = Vue.extend(terminalComp);
-
+  const mountWithProps = props => {
+    const TerminalComponent = Vue.extend(terminalComp);
     component = new TerminalComponent({
-      propsData: {
-        terminalPath,
-      },
+      propsData: props,
     }).$mount();
-  });
+  };
+
+  describe('enabled', () => {
+    beforeEach(() => {
+      mountWithProps({ terminalPath });
+    });
+
+    describe('computed', () => {
+      it('title', () => {
+        expect(component.title).toEqual('Terminal');
+      });
+    });
 
-  describe('computed', () => {
-    it('title', () => {
-      expect(component.title).toEqual('Terminal');
+    it('should render a link to open a web terminal with the provided path', () => {
+      expect(component.$el.tagName).toEqual('A');
+      expect(component.$el.getAttribute('data-original-title')).toEqual('Terminal');
+      expect(component.$el.getAttribute('aria-label')).toEqual('Terminal');
+      expect(component.$el.getAttribute('href')).toEqual(terminalPath);
+    });
+
+    it('should render a non-disabled button', () => {
+      expect(component.$el.classList).not.toContain('disabled');
     });
   });
 
-  it('should render a link to open a web terminal with the provided path', () => {
-    expect(component.$el.tagName).toEqual('A');
-    expect(component.$el.getAttribute('data-original-title')).toEqual('Terminal');
-    expect(component.$el.getAttribute('aria-label')).toEqual('Terminal');
-    expect(component.$el.getAttribute('href')).toEqual(terminalPath);
+  describe('disabled', () => {
+    beforeEach(() => {
+      mountWithProps({ terminalPath, disabled: true });
+    });
+
+    it('should render a disabled button', () => {
+      expect(component.$el.classList).toContain('disabled');
+    });
   });
 });
diff --git a/spec/lib/gitlab/prometheus/query_variables_spec.rb b/spec/lib/gitlab/prometheus/query_variables_spec.rb
index 78974cadb69..78c74266c61 100644
--- a/spec/lib/gitlab/prometheus/query_variables_spec.rb
+++ b/spec/lib/gitlab/prometheus/query_variables_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe Gitlab::Prometheus::QueryVariables do
   describe '.call' do
-    set(:environment) { create(:environment) }
+    let(:environment) { create(:environment) }
     let(:slug) { environment.slug }
 
     subject { described_class.call(environment) }
@@ -20,7 +20,7 @@ describe Gitlab::Prometheus::QueryVariables do
       it { is_expected.to include(kube_namespace: '') }
     end
 
-    context 'with deplyoment platform' do
+    context 'with deployment platform' do
       let(:kube_namespace) { environment.deployment_platform.actual_namespace }
 
       before do
diff --git a/spec/serializers/environment_entity_spec.rb b/spec/serializers/environment_entity_spec.rb
index b7324a26ed2..791b64dc356 100644
--- a/spec/serializers/environment_entity_spec.rb
+++ b/spec/serializers/environment_entity_spec.rb
@@ -40,4 +40,34 @@ describe EnvironmentEntity do
       expect(subject).to include(:metrics_path)
     end
   end
+
+  context 'with deployment platform' do
+    let(:project) { create(:project, :repository) }
+    let(:environment) { create(:environment, project: project) }
+
+    context 'when deployment platform is a cluster' do
+      before do
+        create(:cluster,
+               :provided_by_gcp,
+               :project,
+               environment_scope: '*',
+               projects: [project])
+      end
+
+      it 'should include cluster_type' do
+        expect(subject).to include(:cluster_type)
+        expect(subject[:cluster_type]).to eq('project_type')
+      end
+    end
+
+    context 'when deployment platform is a Kubernetes Service' do
+      before do
+        create(:kubernetes_service, project: project)
+      end
+
+      it 'should not include cluster_type' do
+        expect(subject).not_to include(:cluster_type)
+      end
+    end
+  end
 end