diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-05 18:07:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-05 18:07:51 +0000 |
| commit | 6a7cc8c14727f6fac64a5be6838764d8d5d41468 (patch) | |
| tree | 97c8a3c2f180d26f0f8f0baaa3230352b8ef1efb /spec/controllers/projects/merge_requests_controller_spec.rb | |
| parent | 872319738757edc0483346c75a2407f7019b963f (diff) | |
| download | gitlab-ce-6a7cc8c14727f6fac64a5be6838764d8d5d41468.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 4519cd014a1..ef5f286502b 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -1073,7 +1073,7 @@ describe Projects::MergeRequestsController do end it 'renders MergeRequest as JSON' do - expect(json_response.keys).to include('id', 'iid', 'description') + expect(json_response.keys).to include('id', 'iid') end end @@ -1107,7 +1107,7 @@ describe Projects::MergeRequestsController do it 'renders MergeRequest as JSON' do subject - expect(json_response.keys).to include('id', 'iid', 'description') + expect(json_response.keys).to include('id', 'iid') end end |