diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-12-21 14:03:15 +0100 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-12-21 14:23:14 +0100 |
| commit | 5825652d2c936f3a8d921f0e66f8c02257a79886 (patch) | |
| tree | 75ddf2e5948778635238e4484a4dfd846e19ca41 | |
| parent | 5feae32bf37b85629a8e5657503e25a12df46654 (diff) | |
| download | gitlab-ce-bvl-patch-mr-serializer-stable-ce.tar.gz | |
Fall back to the `MergeRequestWidgetEntity`bvl-patch-mr-serializer-stable-ce
When no serializer was passed.
| -rw-r--r-- | app/serializers/merge_request_serializer.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/app/serializers/merge_request_serializer.rb b/app/serializers/merge_request_serializer.rb index 52eb30d688a..caf193bdae3 100644 --- a/app/serializers/merge_request_serializer.rb +++ b/app/serializers/merge_request_serializer.rb @@ -7,7 +7,7 @@ class MergeRequestSerializer < BaseSerializer case opts[:serializer] when 'basic', 'sidebar' MergeRequestBasicEntity - when 'widget' + else # It's 'widget' MergeRequestWidgetEntity end diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index d03ecefe47f..48674e06172 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -98,6 +98,14 @@ describe Projects::MergeRequestsController do expect(response).to match_response_schema('entities/merge_request_widget') end end + + context 'when no serialiser was passed' do + it 'renders widget MR entity as json' do + go(serializer: nil, format: :json) + + expect(response).to match_response_schema('entities/merge_request_widget') + end + end end describe "as diff" do |