Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 58 deletions

diff --git a/spec/models/clusters/providers/aws_spec.rb b/spec/models/clusters/providers/aws_spec.rb
index 2afed663edf..cb2960e1557 100644
--- a/spec/models/clusters/providers/aws_spec.rb
+++ b/spec/models/clusters/providers/aws_spec.rb
@@ -75,39 +75,6 @@ RSpec.describe Clusters::Providers::Aws do
     end
   end
 
-  describe '#api_client' do
-    let(:provider) { create(:cluster_provider_aws) }
-    let(:credentials) { double }
-    let(:client) { double }
-
-    subject { provider.api_client }
-
-    before do
-      allow(provider).to receive(:credentials).and_return(credentials)
-
-      expect(Aws::CloudFormation::Client).to receive(:new)
-        .with(credentials: credentials, region: provider.region)
-        .and_return(client)
-    end
-
-    it { is_expected.to eq client }
-  end
-
-  describe '#credentials' do
-    let(:provider) { create(:cluster_provider_aws) }
-    let(:credentials) { double }
-
-    subject { provider.credentials }
-
-    before do
-      expect(Aws::Credentials).to receive(:new)
-        .with(provider.access_key_id, provider.secret_access_key, provider.session_token)
-        .and_return(credentials)
-    end
-
-    it { is_expected.to eq credentials }
-  end
-
   describe '#created_by_user' do
     let(:provider) { create(:cluster_provider_aws) }
 
diff --git a/spec/models/clusters/providers/gcp_spec.rb b/spec/models/clusters/providers/gcp_spec.rb
index a1f00069937..afd5699091a 100644
--- a/spec/models/clusters/providers/gcp_spec.rb
+++ b/spec/models/clusters/providers/gcp_spec.rb
@@ -111,31 +111,6 @@ RSpec.describe Clusters::Providers::Gcp do
     end
   end
 
-  describe '#api_client' do
-    subject { gcp.api_client }
-
-    context 'when status is creating' do
-      let(:gcp) { build(:cluster_provider_gcp, :creating) }
-
-      it 'returns Cloud Platform API clinet' do
-        expect(subject).to be_an_instance_of(GoogleApi::CloudPlatform::Client)
-        expect(subject.access_token).to eq(gcp.access_token)
-      end
-    end
-
-    context 'when status is created' do
-      let(:gcp) { build(:cluster_provider_gcp, :created) }
-
-      it { is_expected.to be_nil }
-    end
-
-    context 'when status is errored' do
-      let(:gcp) { build(:cluster_provider_gcp, :errored) }
-
-      it { is_expected.to be_nil }
-    end
-  end
-
   describe '#nullify_credentials' do
     let(:provider) { create(:cluster_provider_gcp, :creating) }