From 3ea1f91e1ee9434b47c744303c409c077eb89f14 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Tue, 7 Feb 2017 17:48:42 +0100 Subject: Fix merge request controller specs for new action --- spec/controllers/projects/merge_requests_controller_spec.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index d18e8c37901..63780802cfa 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -33,11 +33,17 @@ describe Projects::MergeRequestsController do end context 'when rendering JSON response' do + before do + create(:ci_pipeline, sha: fork_project.commit('remove-submodule').id, + ref: 'remove-submodule', + project: fork_project) + end + it 'renders JSON including serialized pipelines' do submit_new_merge_request(format: :json) - expect(json_response).to have_key('pipelines') expect(response).to be_ok + expect(json_response).not_to be_empty end end end -- cgit v1.2.1