summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-02-07 17:48:42 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-02-07 17:50:13 +0100
commit3ea1f91e1ee9434b47c744303c409c077eb89f14 (patch)
tree8ddea88d0254d6bbcf1f1ca4f8b8b46a55388ac7 /spec/controllers
parent1d0820c71872934e6f7d8c6a4df8889b797f0fa6 (diff)
downloadgitlab-ce-3ea1f91e1ee9434b47c744303c409c077eb89f14.tar.gz
Fix merge request controller specs for new actionfix/gb/invalid-new-merge-request-api
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/projects/merge_requests_controller_spec.rb8
1 files changed, 7 insertions, 1 deletions
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