diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-15 21:06:25 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-15 21:06:25 +0000 |
commit | 0ff031c7f4e2c7fe1b671b30fef569eb3fbea942 (patch) | |
tree | 0493e9faf4bb9d69c06226901cea12f22714a92a /spec/features/projects/jobs_spec.rb | |
parent | 7b8ec6e718331dd1f8330f08f49f01ba2c20b84c (diff) | |
download | gitlab-ce-0ff031c7f4e2c7fe1b671b30fef569eb3fbea942.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/projects/jobs_spec.rb')
-rw-r--r-- | spec/features/projects/jobs_spec.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb index cebca338f33..458c67760d5 100644 --- a/spec/features/projects/jobs_spec.rb +++ b/spec/features/projects/jobs_spec.rb @@ -534,7 +534,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do end it 'shows deployment message' do - expect(page).to have_content 'This job is the most recent deployment to production' + expect(page).to have_content 'This job is deployed to production' expect(find('.js-environment-link')['href']).to match("environments/#{environment.id}") end @@ -548,14 +548,14 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do end it 'shows the name of the cluster' do - expect(page).to have_content 'Cluster the-cluster was used' + expect(page).to have_content 'using cluster the-cluster' end context 'when the user is not able to view the cluster' do let(:user_access_level) { :developer } it 'includes only the name of the cluster without a link' do - expect(page).to have_content 'Cluster the-cluster was used' + expect(page).to have_content 'using cluster the-cluster' expect(page).not_to have_link 'the-cluster' end end @@ -623,8 +623,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do let!(:second_deployment) { create(:deployment, :success, environment: environment, deployable: second_build) } it 'shows deployment message' do - expected_text = 'This job is an out-of-date deployment ' \ - "to staging. View the most recent deployment ##{second_deployment.iid}." + expected_text = 'This job is an out-of-date deployment to staging. View the most recent deployment.' expect(page).to have_css('.environment-information', text: expected_text) end |