summaryrefslogtreecommitdiff
path: root/spec/features/projects/jobs_spec.rb
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-06-05 11:09:51 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2019-06-05 11:09:51 +0000
commite58e24b4d4256a42c0c7e764227f3c3c53fdb1bd (patch)
treefda5238ab4372c55f442730231af772f767cf1a2 /spec/features/projects/jobs_spec.rb
parentd9a761ed14ab5025626dee17faf1528c1264a1b0 (diff)
downloadgitlab-ce-e58e24b4d4256a42c0c7e764227f3c3c53fdb1bd.tar.gz
Revert "Merge branch..."revert-86900f00
This reverts merge request !27503
Diffstat (limited to 'spec/features/projects/jobs_spec.rb')
-rw-r--r--spec/features/projects/jobs_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index d0878c4088a..03562bd382e 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -936,8 +936,8 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
find('.js-cancel-job').click
end
- it 'loads the page and shows no controls' do
- expect(page).not_to have_content 'Retry'
+ it 'loads the page and shows all needed controls' do
+ expect(page).to have_content 'Retry'
end
end
end
@@ -946,7 +946,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
context "Job from project", :js do
before do
job.run!
- job.drop!(:script_failure)
+ job.cancel!
visit project_job_path(project, job)
wait_for_requests