Revert conflicting EE changes

8 files changed, 30 insertions, 22 deletions

diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index f4ab732caa4..f7fa834d7a2 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -48,19 +48,6 @@ FactoryGirl.define do
       end
     end
 
-    trait :kubernetes do
-      after :create do |project|
-        project.create_kubernetes_service(
-          active: true,
-          properties: {
-            namespace: project.path,
-            api_url: 'https://kubernetes.example.com/api',
-            token: 'a' * 40,
-          }
-        )
-      end
-    end
-
     # Nest Project Feature attributes
     transient do
       wiki_access_level ProjectFeature::ENABLED
@@ -150,4 +137,17 @@ FactoryGirl.define do
       )
     end
   end
+
+  factory :kubernetes_project, parent: :empty_project do
+    after :create do |project|
+      project.create_kubernetes_service(
+        active: true,
+        properties: {
+          namespace: project.path,
+          api_url: 'https://kubernetes.example.com',
+          token: 'a' * 40,
+        }
+      )
+    end
+  end
 end
diff --git a/spec/features/auto_deploy_spec.rb b/spec/features/auto_deploy_spec.rb
index e581aa411b0..92f1ab90881 100644
--- a/spec/features/auto_deploy_spec.rb
+++ b/spec/features/auto_deploy_spec.rb
@@ -4,9 +4,17 @@ describe 'Auto deploy' do
   include WaitForAjax
 
   let(:user) { create(:user) }
-  let(:project) { create(:project, :kubernetes) }
+  let(:project) { create(:project) }
 
   before do
+    project.create_kubernetes_service(
+      active: true,
+      properties: {
+        namespace: project.path,
+        api_url: 'https://kubernetes.example.com',
+        token: 'a' * 40,
+      }
+    )
     project.team << [user, :master]
     login_as user
   end
diff --git a/spec/features/environment_spec.rb b/spec/features/environment_spec.rb
index c7411f1f4ac..56f6cd2e095 100644
--- a/spec/features/environment_spec.rb
+++ b/spec/features/environment_spec.rb
@@ -93,7 +93,7 @@ feature 'Environment', :feature do
           end
 
           context 'with terminal' do
-            let(:project) { create(:empty_project, :kubernetes, :test_repo) }
+            let(:project) { create(:kubernetes_project, :test_repo) }
 
             context 'for project master' do
               let(:role) { :master }
diff --git a/spec/features/environments_spec.rb b/spec/features/environments_spec.rb
index e1387e44be8..72b984cfab8 100644
--- a/spec/features/environments_spec.rb
+++ b/spec/features/environments_spec.rb
@@ -151,7 +151,7 @@ feature 'Environments page', :feature, :js do
         end
 
         context 'with terminal' do
-          let(:project) { create(:empty_project, :kubernetes, :test_repo) }
+          let(:project) { create(:kubernetes_project, :test_repo) }
 
           context 'for project master' do
             let(:role) { :master }
diff --git a/spec/models/environment_spec.rb b/spec/models/environment_spec.rb
index 2aa63d7bcc3..93eb402e060 100644
--- a/spec/models/environment_spec.rb
+++ b/spec/models/environment_spec.rb
@@ -200,7 +200,7 @@ describe Environment, models: true do
 
     context 'when the enviroment is available' do
       context 'with a deployment service' do
-        let(:project) { create(:empty_project, :kubernetes) }
+        let(:project) { create(:kubernetes_project) }
 
         context 'and a deployment' do
           let!(:deployment) { create(:deployment, environment: environment) }
@@ -218,14 +218,14 @@ describe Environment, models: true do
     end
 
     context 'when the environment is unavailable' do
-      let(:project) { create(:empty_project, :kubernetes) }
+      let(:project) { create(:kubernetes_project) }
       before { environment.stop }
       it { is_expected.to be_falsy }
     end
   end
 
   describe '#terminals' do
-    let(:project) { create(:empty_project, :kubernetes) }
+    let(:project) { create(:kubernetes_project) }
     subject { environment.terminals }
 
     context 'when the environment has terminals' do
diff --git a/spec/models/project_services/kubernetes_service_spec.rb b/spec/models/project_services/kubernetes_service_spec.rb
index 0b20f4d3154..4f3cd14e941 100644
--- a/spec/models/project_services/kubernetes_service_spec.rb
+++ b/spec/models/project_services/kubernetes_service_spec.rb
@@ -4,7 +4,7 @@ describe KubernetesService, models: true, caching: true do
   include KubernetesHelpers
   include ReactiveCachingHelpers
 
-  let(:project) { create(:empty_project, :kubernetes) }
+  let(:project) { create(:kubernetes_project) }
   let(:service) { project.kubernetes_service }
 
   # We use Kubeclient to interactive with the Kubernetes API. It will
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 8be99bbf3ee..88d5d14f855 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -1719,7 +1719,7 @@ describe Project, models: true do
     end
 
     context 'when project has a deployment service' do
-      let(:project) { create(:empty_project, :kubernetes) }
+      let(:project) { create(:kubernetes_project) }
 
       it 'returns variables from this service' do
         expect(project.deployment_variables).to include(
diff --git a/spec/workers/reactive_caching_worker_spec.rb b/spec/workers/reactive_caching_worker_spec.rb
index c6009e25713..5f4453c15d6 100644
--- a/spec/workers/reactive_caching_worker_spec.rb
+++ b/spec/workers/reactive_caching_worker_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe ReactiveCachingWorker do
-  let(:project) { create(:empty_project, :kubernetes) }
+  let(:project) { create(:kubernetes_project) }
   let(:service) { project.deployment_service }
   subject { described_class.new.perform("KubernetesService", service.id) }