summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-12-27 10:52:04 +0000
committerMarin Jankovski <marin@gitlab.com>2016-12-27 16:50:01 +0000
commit18caf1ccb17d95e3471c335b8d2e965ac4251de7 (patch)
treed0bdc4bf3f53c9a2908cb7b2572597de926fcc45 /spec
parentf6f5cbbb7655f5950609ff6af7628a652a5b199c (diff)
downloadgitlab-ce-18caf1ccb17d95e3471c335b8d2e965ac4251de7.tar.gz
Merge branch 'auto-deploy-with-space' into 'master'
Rename "autodeploy" to "auto deploy" Closes #25999 See merge request !8289
Diffstat (limited to 'spec')
-rw-r--r--spec/features/auto_deploy_spec.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/spec/features/auto_deploy_spec.rb b/spec/features/auto_deploy_spec.rb
index 92f1ab90881..ea7a97d1d4f 100644
--- a/spec/features/auto_deploy_spec.rb
+++ b/spec/features/auto_deploy_spec.rb
@@ -26,7 +26,7 @@ describe 'Auto deploy' do
it 'does not show a button to set up auto deploy' do
visit namespace_project_path(project.namespace, project)
- expect(page).to have_no_content('Set up autodeploy')
+ expect(page).to have_no_content('Set up auto deploy')
end
end
@@ -37,11 +37,11 @@ describe 'Auto deploy' do
end
it 'shows a button to set up auto deploy' do
- expect(page).to have_link('Set up autodeploy')
+ expect(page).to have_link('Set up auto deploy')
end
- it 'includes Kubernetes as an available template', js: true do
- click_link 'Set up autodeploy'
+ it 'includes OpenShift as an available template', js: true do
+ click_link 'Set up auto deploy'
click_button 'Choose a GitLab CI Yaml template'
within '.gitlab-ci-yml-selector' do
@@ -49,8 +49,8 @@ describe 'Auto deploy' do
end
end
- it 'creates a merge request using "autodeploy" branch', js: true do
- click_link 'Set up autodeploy'
+ it 'creates a merge request using "auto-deploy" branch', js: true do
+ click_link 'Set up auto deploy'
click_button 'Choose a GitLab CI Yaml template'
within '.gitlab-ci-yml-selector' do
click_on 'OpenShift'
@@ -58,7 +58,7 @@ describe 'Auto deploy' do
wait_for_ajax
click_button 'Commit Changes'
- expect(page).to have_content('New Merge Request From autodeploy into master')
+ expect(page).to have_content('New Merge Request From auto-deploy into master')
end
end
end