Address BE review - re-arrange some specs

3 files changed, 9 insertions, 5 deletions

diff --git a/spec/services/clusters/gcp/kubernetes/create_service_account_service_spec.rb b/spec/services/clusters/gcp/kubernetes/create_service_account_service_spec.rb
index 5268ae8a6d7..065d021db5e 100644
--- a/spec/services/clusters/gcp/kubernetes/create_service_account_service_spec.rb
+++ b/spec/services/clusters/gcp/kubernetes/create_service_account_service_spec.rb
@@ -8,12 +8,11 @@ describe Clusters::Gcp::Kubernetes::CreateServiceAccountService do
   let(:service) { described_class.new(kubeclient, rbac: rbac) }
 
   describe '#execute' do
-    subject { service.execute }
-
     let(:rbac) { false }
     let(:api_url) { 'http://111.111.111.111' }
     let(:username) { 'admin' }
     let(:password) { 'xxx' }
+
     let(:kubeclient) do
       Gitlab::Kubernetes::KubeClient.new(
         api_url,
@@ -22,6 +21,8 @@ describe Clusters::Gcp::Kubernetes::CreateServiceAccountService do
       )
     end
 
+    subject { service.execute }
+
     context 'when params are correct' do
       before do
         stub_kubeclient_discover(api_url)
diff --git a/spec/services/clusters/gcp/kubernetes/fetch_kubernetes_token_service_spec.rb b/spec/services/clusters/gcp/kubernetes/fetch_kubernetes_token_service_spec.rb
index 4c34f21c1bc..c543de21d5b 100644
--- a/spec/services/clusters/gcp/kubernetes/fetch_kubernetes_token_service_spec.rb
+++ b/spec/services/clusters/gcp/kubernetes/fetch_kubernetes_token_service_spec.rb
@@ -1,9 +1,9 @@
+# frozen_string_literal: true
+
 require 'fast_spec_helper'
 
 describe Clusters::Gcp::Kubernetes::FetchKubernetesTokenService do
   describe '#execute' do
-    subject { described_class.new(kubeclient).execute }
-
     let(:api_url) { 'http://111.111.111.111' }
     let(:username) { 'admin' }
     let(:password) { 'xxx' }
@@ -16,6 +16,8 @@ describe Clusters::Gcp::Kubernetes::FetchKubernetesTokenService do
       )
     end
 
+    subject { described_class.new(kubeclient).execute }
+
     context 'when params correct' do
       let(:decoded_token) { 'xxx.token.xxx' }
       let(:token) { Base64.encode64(decoded_token) }
diff --git a/spec/support/services/clusters/create_service_shared.rb b/spec/support/services/clusters/create_service_shared.rb
index e2b5920d794..22f712f3fcf 100644
--- a/spec/support/services/clusters/create_service_shared.rb
+++ b/spec/support/services/clusters/create_service_shared.rb
@@ -32,10 +32,11 @@ end
 shared_examples 'create cluster service success' do
   before do
     stub_feature_flags(rbac_clusters: false)
-    expect(ClusterProvisionWorker).to receive(:perform_async)
   end
 
   it 'creates a cluster object and performs a worker' do
+    expect(ClusterProvisionWorker).to receive(:perform_async)
+
     expect { subject }
       .to change { Clusters::Cluster.count }.by(1)
       .and change { Clusters::Providers::Gcp.count }.by(1)