diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-12-21 23:25:23 +0300 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-12-21 23:27:51 +0300 |
commit | 4a1e1281ac862a0c86d62473ab09d559c7ec5485 (patch) | |
tree | 2333a56a8cc228d2d4bb075677b2846aff8129b7 /spec/features | |
parent | 3cb8f01b9a33925bd65347f4a97c6db2f787589c (diff) |
Revert conflicting EE changes
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/auto_deploy_spec.rb | 10 | ||||
-rw-r--r-- | spec/features/environment_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/environments_spec.rb | 2 |
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 } |