summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2017-03-28 17:04:14 -0300
committerFelipe Artur <felipefac@gmail.com>2017-05-08 11:29:10 -0300
commitd9bebd89dfcf7e4b163b271eea3d7a5c3e99fb5d (patch)
tree94a54961d28098ea0675f2cb15ea19bbe27166e6 /spec/controllers
parent1bf2dacf2002fabf3b7bd364031d9020e5d0b624 (diff)
downloadgitlab-ce-d9bebd89dfcf7e4b163b271eea3d7a5c3e99fb5d.tar.gz
Fix specs 2
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/projects/merge_requests_controller_spec.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index bc13a8123a5..d9dae999a87 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -1200,7 +1200,10 @@ describe Projects::MergeRequestsController do
let(:status) { pipeline.detailed_status(double('user')) }
- before { get_pipeline_status }
+ before do
+ merge_request.update(head_pipeline: pipeline)
+ get_pipeline_status
+ end
it 'return a detailed head_pipeline status in json' do
expect(response).to have_http_status(:ok)