Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 5 deletions

diff --git a/spec/serializers/cluster_basic_entity_spec.rb b/spec/serializers/deployment_cluster_entity_spec.rb
index 8c3307a1837..b22a93fcec7 100644
--- a/spec/serializers/cluster_basic_entity_spec.rb
+++ b/spec/serializers/deployment_cluster_entity_spec.rb
@@ -2,9 +2,9 @@
 
 require 'spec_helper'
 
-describe ClusterBasicEntity do
+describe DeploymentClusterEntity do
   describe '#as_json' do
-    subject { described_class.new(cluster, request: request).as_json }
+    subject { described_class.new(deployment, request: request).as_json }
 
     let(:maintainer) { create(:user) }
     let(:developer) { create(:user) }
@@ -12,26 +12,30 @@ describe ClusterBasicEntity do
     let(:request) { double(:request, current_user: current_user) }
     let(:project) { create(:project) }
     let(:cluster) { create(:cluster, name: 'the-cluster', projects: [project]) }
+    let(:deployment) { create(:deployment, cluster: cluster) }
+    let!(:deployment_cluster) { create(:deployment_cluster, cluster: cluster, deployment: deployment) }
 
     before do
       project.add_maintainer(maintainer)
       project.add_developer(developer)
     end
 
-    it 'matches cluster_basic entity schema' do
-      expect(subject.as_json).to match_schema('cluster_basic')
+    it 'matches deployment_cluster entity schema' do
+      expect(subject.as_json).to match_schema('deployment_cluster')
     end
 
     it 'exposes the cluster details' do
       expect(subject[:name]).to eq('the-cluster')
       expect(subject[:path]).to eq("/#{project.full_path}/-/clusters/#{cluster.id}")
+      expect(subject[:kubernetes_namespace]).to eq(deployment_cluster.kubernetes_namespace)
     end
 
     context 'when the user does not have permission to view the cluster' do
       let(:current_user) { developer }
 
-      it 'does not include the path' do
+      it 'does not include the path nor the namespace' do
         expect(subject[:path]).to be_nil
+        expect(subject[:kubernetes_namespace]).to be_nil
       end
     end
   end