Fix corrputed tests

spec/controllers/projects/clusters_controller_spec.rb

@@ -4,7 +4,7 @@ describe Projects::ClustersController do
   include AccessMatchersForController
   include GoogleApi::CloudPlatformHelpers
 
-  set(:project) { create(:project) }
+  let(:project) { create(:project) }
 
   describe 'GET index' do
     describe 'functionality' do
@@ -287,7 +287,7 @@ describe Projects::ClustersController do
     end
 
     describe 'security' do
-      set(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
+      let(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
 
       let(:params) do
         { cluster: { enabled: false } }
@@ -371,7 +371,7 @@ describe Projects::ClustersController do
     end
 
     describe 'security' do
-      let(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
+      let(:cluster) { create(:cluster, :provided_by_gcp, environment_scope: 'prod/*', projects: [project]) }
 
       it { expect { go }.to be_allowed_for(:admin) }
       it { expect { go }.to be_allowed_for(:owner).of(project) }

spec/ee/spec/models/ee/project_spec.rb

@@ -709,7 +709,7 @@ describe Project do
     context 'when environment is specified' do
       let(:environment) { create(:environment, project: project, name: 'review/name') }
       let!(:default_cluster) { create(:cluster, :provided_by_user, projects: [project], environment_scope: '*') }
-      let!(:cluster) { create(:cluster, :provided_by_user, projects: [project]) }
+      let!(:cluster) { create(:cluster, :provided_by_user, environment_scope: 'review/*', projects: [project]) }
 
       subject { project.deployment_platform(environment: environment) }
 
@@ -782,8 +782,6 @@ describe Project do
       end
 
       context 'when environment scope has _' do
-        let!(:cluster) { create(:cluster, :provided_by_user, projects: [project]) }
-
         before do
           stub_licensed_features(multiple_clusters: true)
         end
@@ -807,8 +805,6 @@ describe Project do
       # it doesn't break in case some data sneaked in somehow as we're
       # not checking this integrity in database level.
       context 'when environment scope has %' do
-        let!(:cluster) { create(:cluster, :provided_by_user, projects: [project]) }
-
         before do
           stub_licensed_features(multiple_clusters: true)
         end
@@ -827,15 +823,14 @@ describe Project do
         end
       end
 
-      context 'when variables with the same name have different environment scopes' do
-        let!(:partially_matched_cluster) { create(:cluster, :provided_by_user, projects: [project], environment_scope: 'review/*') }
+      context 'when perfectly matched cluster exists' do
         let!(:perfectly_matched_cluster) { create(:cluster, :provided_by_user, projects: [project], environment_scope: 'review/name') }
 
         before do
           stub_licensed_features(multiple_clusters: true)
         end
 
-        it 'puts variables matching environment scope more in the end' do
+        it 'returns perfectly matched cluster as highest precedence' do
           is_expected.to eq(perfectly_matched_cluster.platform_kubernetes)
         end
       end

spec/finders/clusters_finder_spec.rb

@@ -6,7 +6,7 @@ describe ClustersFinder do
 
   describe '#execute' do
     let(:enabled_cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
-    let(:disabled_cluster) { create(:cluster, :disabled, :provided_by_gcp, projects: [project]) }
+    let(:disabled_cluster) { create(:cluster, :disabled, :provided_by_gcp, environment_scope: 'prod/*', projects: [project]) }
 
     subject { described_class.new(project, user, scope).execute }
 

spec/models/clusters/cluster_spec.rb

@@ -137,20 +137,20 @@ describe Clusters::Cluster do
       end
 
       context 'when identical environment scope exists in project' do
-        let(:cluster) { create(:cluster, projects: [project], environment_scope: 'product/*') }
+        let(:cluster) { build(:cluster, projects: [project], environment_scope: 'product/*') }
 
         it { is_expected.to be_falsey }
       end
 
       context 'when identical environment scope does not exist in project' do
-        let(:cluster) { create(:cluster, projects: [project], environment_scope: '*') }
+        let(:cluster) { build(:cluster, projects: [project], environment_scope: '*') }
 
         it { is_expected.to be_truthy }
       end
 
       context 'when identical environment scope exists in different project' do
         let(:project2) { create(:project) }
-        let(:cluster) { create(:cluster, projects: [project2], environment_scope: 'product/*') }
+        let(:cluster) { build(:cluster, projects: [project2], environment_scope: 'product/*') }
 
         it { is_expected.to be_truthy }
       end

spec/services/clusters/create_service_spec.rb

@@ -81,7 +81,7 @@ describe Clusters::CreateService do
     end
 
     context 'when project has a cluster' do
-      let!(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
+      let!(:cluster) { create(:cluster, :provided_by_gcp, environment_scope: 'prod/*', projects: [project]) }
 
       before do
         allow(project).to receive(:feature_available?).and_call_original