diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-01-15 16:10:51 +0300 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-01-15 16:10:51 +0300 |
commit | 15e12fd95feab8a9e0e1514e6aa81e3b52851a13 (patch) | |
tree | 4b83ccbf5e2466bf5415506d305b4ea26cc98269 /spec | |
parent | d80b513518636f6fe74ac969540a4e1ac41012a2 (diff) | |
parent | cd56625a0e1c4126890c65cade986353dcac602b (diff) |
Merge branch '41970-job-play-button' into 'master'
Resolve "Empty state for manual job - play button does not work"
Closes #41970
See merge request gitlab-org/gitlab-ce!16426
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/projects/jobs_spec.rb | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb index 9a6b27c00f8..a5cd858b11a 100644 --- a/spec/features/projects/jobs_spec.rb +++ b/spec/features/projects/jobs_spec.rb @@ -380,9 +380,18 @@ feature 'Jobs' do it 'shows manual action empty state' do expect(page).to have_content('This job requires a manual action') - expect(page).to have_content('This job depends on a user to trigger its process. Often they are used to deploy code to production environments.') + expect(page).to have_content('This job depends on a user to trigger its process. Often they are used to deploy code to production environments') expect(page).to have_link('Trigger this manual action') end + + it 'plays manual action', :js do + click_link 'Trigger this manual action' + + wait_for_requests + expect(page).to have_content('This job has not been triggered') + expect(page).to have_content('This job is stuck, because the project doesn\'t have any runners online assigned to it.') + expect(page).to have_content('pending') + end end context 'Non triggered job' do @@ -392,9 +401,8 @@ feature 'Jobs' do visit project_job_path(project, job) end - it 'shows manual action empty state' do + it 'shows empty state' do expect(page).to have_content('This job has not been triggered yet') - expect(page).to have_content('This job depends on upstream jobs that need to succeed in order for this job to be triggered.') end end end |