Add latest changes from gitlab-org/gitlab@master

1 files changed, 19 insertions, 9 deletions

diff --git a/spec/lib/gitlab/kubernetes/kube_client_spec.rb b/spec/lib/gitlab/kubernetes/kube_client_spec.rb
index e08981a3415..729c2b04930 100644
--- a/spec/lib/gitlab/kubernetes/kube_client_spec.rb
+++ b/spec/lib/gitlab/kubernetes/kube_client_spec.rb
@@ -229,20 +229,30 @@ describe Gitlab::Kubernetes::KubeClient do
     end
   end
 
-  describe 'extensions API group' do
-    let(:api_groups) { ['apis/extensions'] }
+  describe '#get_deployments' do
     let(:extensions_client) { client.extensions_client }
+    let(:apps_client) { client.apps_client }
 
-    describe '#get_deployments' do
-      include_examples 'redirection not allowed', 'get_deployments'
-      include_examples 'dns rebinding not allowed', 'get_deployments'
+    include_examples 'redirection not allowed', 'get_deployments'
+    include_examples 'dns rebinding not allowed', 'get_deployments'
 
-      it 'delegates to the extensions client' do
-        expect(client).to delegate_method(:get_deployments).to(:extensions_client)
+    it 'delegates to the extensions client' do
+      expect(extensions_client).to receive(:get_deployments)
+
+      client.get_deployments
+    end
+
+    context 'extensions does not have deployments for Kubernetes 1.16+ clusters' do
+      before do
+        WebMock
+          .stub_request(:get, api_url + '/apis/extensions/v1beta1')
+          .to_return(kube_response(kube_1_16_extensions_v1beta1_discovery_body))
       end
 
-      it 'responds to the method' do
-        expect(client).to respond_to :get_deployments
+      it 'delegates to the apps client' do
+        expect(apps_client).to receive(:get_deployments)
+
+        client.get_deployments
       end
     end
   end