summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/merge_requests_controller_spec.rb
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-10-31 16:15:03 +0000
committerPhil Hughes <me@iamphill.com>2017-10-31 16:15:03 +0000
commit6dc9028fbb3856c8c7814446ed176880f7d5213f (patch)
treeb45870b8c946e5304a2fd3ad64a1453d166da0ca /spec/controllers/projects/merge_requests_controller_spec.rb
parent74a0e855e1d5049e265c85ac01d511c25f2a46f1 (diff)
downloadgitlab-ce-6dc9028fbb3856c8c7814446ed176880f7d5213f.tar.gz
Load participants async
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
-rw-r--r--spec/controllers/projects/merge_requests_controller_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index b7cccddefdd..52ef8c6a589 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -83,15 +83,15 @@ describe Projects::MergeRequestsController do
end
describe 'as json' do
- context 'with basic param' do
+ context 'with basic serializer param' do
it 'renders basic MR entity as json' do
- go(basic: true, format: :json)
+ go(serializer: 'basic', format: :json)
expect(response).to match_response_schema('entities/merge_request_basic')
end
end
- context 'without basic param' do
+ context 'without basic serializer param' do
it 'renders the merge request in the json format' do
go(format: :json)