Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-11-27 16:35:16 +0300
committerShinya Maeda <shinya@gitlab.com>2017-11-28 14:47:59 +0300
commit53da3d976f3705a87edc50dca41748b5e479fc83 (patch)
tree665bca72e99ce5033b814ac6cb94cce11ea63825 /spec/features/auto_deploy_spec.rb
parent1d7e3ef1a55991e057213add556926eb13e0bd48 (diff)
Replce kubernetes_service and deployment_service to deployment_platform
Diffstat (limited to 'spec/features/auto_deploy_spec.rb')
-rw-r--r--spec/features/auto_deploy_spec.rb59
1 files changed, 11 insertions, 48 deletions
diff --git a/spec/features/auto_deploy_spec.rb b/spec/features/auto_deploy_spec.rb
index 327059b86e4..240c5711a7b 100644
--- a/spec/features/auto_deploy_spec.rb
+++ b/spec/features/auto_deploy_spec.rb
@@ -4,13 +4,7 @@ describe 'Auto deploy' do
let(:user) { create(:user) }
let(:project) { create(:project, :repository) }
- context 'when user configured kubernetes from Integration > Kubernetes' do
- before do
- create :kubernetes_service, project: project
- project.team << [user, :master]
- sign_in user
- end
-
+ shared_examples 'correct behavior on KubernetesService and Platform::Kubernetes' do
context 'when no deployment service is active' do
before do
project.kubernetes_service.update!(active: false)
@@ -55,54 +49,23 @@ describe 'Auto deploy' do
end
end
- context 'when user configured kubernetes from CI/CD > Clusters' do
+ context 'when user configured kubernetes from Integration > Kubernetes' do
before do
- create(:cluster, :provided_by_gcp, projects: [project])
+ create :kubernetes_service, project: project
project.team << [user, :master]
sign_in user
end
- context 'when no deployment service is active' do
- before do
- project.kubernetes_service.update!(active: false)
- end
+ it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes'
+ end
- it 'does not show a button to set up auto deploy' do
- visit project_path(project)
- expect(page).to have_no_content('Set up auto deploy')
- end
+ context 'when user configured kubernetes from CI/CD > Clusters' do
+ before do
+ create(:cluster, :provided_by_gcp, projects: [project])
+ project.team << [user, :master]
+ sign_in user
end
- context 'when a deployment service is active' do
- before do
- project.kubernetes_service.update!(active: true)
- visit project_path(project)
- end
-
- it 'shows a button to set up auto deploy' do
- expect(page).to have_link('Set up auto deploy')
- end
-
- it 'includes OpenShift as an available template', :js do
- click_link 'Set up auto deploy'
- click_button 'Apply a GitLab CI Yaml template'
-
- within '.gitlab-ci-yml-selector' do
- expect(page).to have_content('OpenShift')
- end
- end
-
- it 'creates a merge request using "auto-deploy" branch', :js do
- click_link 'Set up auto deploy'
- click_button 'Apply a GitLab CI Yaml template'
- within '.gitlab-ci-yml-selector' do
- click_on 'OpenShift'
- end
- wait_for_requests
- click_button 'Commit changes'
-
- expect(page).to have_content('New Merge Request From auto-deploy into master')
- end
- end
+ it_behaves_like 'correct behavior on KubernetesService and Platform::Kubernetes'
end
end