summaryrefslogtreecommitdiff
path: root/spec/features/projects
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-04-17 15:36:02 +0000
committerTim Zallmann <tzallmann@gitlab.com>2018-04-17 15:36:02 +0000
commit4355a13ad4e04b1ae82b60858376c426ae041699 (patch)
treef54464181045ca2cb0ba7f98f1fc5feb7136186f /spec/features/projects
parentc11e15bc7c14dfd806005026642398ed89fd4b50 (diff)
parent6b14ecb63234ebcb34b7f1d4c2831dc85db70bc0 (diff)
downloadgitlab-ce-4355a13ad4e04b1ae82b60858376c426ae041699.tar.gz
Merge branch '21677-run-pipeline-word' into 'master'
Resolve "Improve wording / copy for running a pipeline" Closes #21677 See merge request gitlab-org/gitlab-ce!18396
Diffstat (limited to 'spec/features/projects')
-rw-r--r--spec/features/projects/pipelines/pipelines_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index 6e63e0f0b49..705ba78a0b7 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -517,7 +517,7 @@ describe 'Pipelines', :js do
end
it 'creates a new pipeline' do
- expect { click_on 'Create pipeline' }
+ expect { click_on 'Run pipeline' }
.to change { Ci::Pipeline.count }.by(1)
expect(Ci::Pipeline.last).to be_web
@@ -526,7 +526,7 @@ describe 'Pipelines', :js do
context 'without gitlab-ci.yml' do
before do
- click_on 'Create pipeline'
+ click_on 'Run pipeline'
end
it { expect(page).to have_content('Missing .gitlab-ci.yml file') }
@@ -539,7 +539,7 @@ describe 'Pipelines', :js do
click_link 'master'
end
- expect { click_on 'Create pipeline' }
+ expect { click_on 'Run pipeline' }
.to change { Ci::Pipeline.count }.by(1)
end
end
@@ -557,7 +557,7 @@ describe 'Pipelines', :js do
it 'has field to add a new pipeline' do
expect(page).to have_selector('.js-branch-select')
expect(find('.js-branch-select')).to have_content project.default_branch
- expect(page).to have_content('Create for')
+ expect(page).to have_content('Run on')
end
end