Revert conflicting EE changes

3 files changed, 11 insertions, 3 deletions

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 }