diff options
author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-06-05 15:35:40 +0100 |
---|---|---|
committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-06-05 15:35:40 +0100 |
commit | bb7f44aa8cf61d590bf45efb20c4ce19234ce03d (patch) | |
tree | 9e7142ae51453d1a9e8421e92618fd4814867465 /spec/features | |
parent | d35ad403f50b2d496f0d5938502fb55ef2190f7c (diff) | |
parent | efed7b6dc4a9db5f3789f30ebbf9748eb716f90f (diff) | |
download | gitlab-ce-bb7f44aa8cf61d590bf45efb20c4ce19234ce03d.tar.gz |
Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redesign-with-draggable-labels
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/projects/jobs/user_browses_job_spec.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/features/projects/jobs/user_browses_job_spec.rb b/spec/features/projects/jobs/user_browses_job_spec.rb index bff5bbe99af..ce0b38b7239 100644 --- a/spec/features/projects/jobs/user_browses_job_spec.rb +++ b/spec/features/projects/jobs/user_browses_job_spec.rb @@ -32,8 +32,6 @@ describe 'User browses a job', :js do page.within('.erased') do expect(page).to have_content('Job has been erased') end - - expect(build.project.running_or_pending_build_count).to eq(build.project.builds.running_or_pending.count(:all)) end context 'with a failed job' do |