diff options
| author | Felipe Artur <felipefac@gmail.com> | 2017-03-22 16:36:14 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-05-08 11:26:04 -0300 |
| commit | 24824cbb4c6d2c5ebd08dea03007f65c5df763da (patch) | |
| tree | 618cc1a50e76126e4aff941bd538a31917e5282b /spec/features/merge_requests/widget_spec.rb | |
| parent | 85f0b3a984048d1e5d146a233612a0bc96f12b5c (diff) | |
| download | gitlab-ce-24824cbb4c6d2c5ebd08dea03007f65c5df763da.tar.gz | |
Fix Specs
Diffstat (limited to 'spec/features/merge_requests/widget_spec.rb')
| -rw-r--r-- | spec/features/merge_requests/widget_spec.rb | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/spec/features/merge_requests/widget_spec.rb b/spec/features/merge_requests/widget_spec.rb index d918181a238..02193dbfc8d 100644 --- a/spec/features/merge_requests/widget_spec.rb +++ b/spec/features/merge_requests/widget_spec.rb @@ -89,6 +89,8 @@ describe 'Merge request', :feature, :js do statuses: [commit_status]) create(:ci_build, :pending, pipeline: pipeline) + merge_request.update(head_pipeline_id: pipeline.id) + visit namespace_project_merge_request_path(project.namespace, project, merge_request) end @@ -101,10 +103,15 @@ describe 'Merge request', :feature, :js do context 'when merge request is in the blocked pipeline state' do before do - create(:ci_pipeline, project: project, - sha: merge_request.diff_head_sha, - ref: merge_request.source_branch, - status: :manual) + pipeline = create( + :ci_pipeline, + project: project, + sha: merge_request.diff_head_sha, + ref: merge_request.source_branch, + status: :manual + ) + + merge_request.update(head_pipeline_id: pipeline.id) visit namespace_project_merge_request_path(project.namespace, project, @@ -129,6 +136,8 @@ describe 'Merge request', :feature, :js do statuses: [commit_status]) create(:ci_build, :pending, pipeline: pipeline) + merge_request.update(head_pipeline_id: pipeline.id) + visit namespace_project_merge_request_path(project.namespace, project, merge_request) end |