diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-09-02 16:16:54 +0100 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-13 14:16:34 -0500 |
| commit | 7529bbae944823041e8690c011c4cfb39534074b (patch) | |
| tree | 15cdb26b25c54c2083f27cc105581dab98c9f70c /spec/controllers | |
| parent | 98dd958df3b4dd1b58b3a3387ea9d52dc78af46b (diff) | |
| download | gitlab-ce-7529bbae944823041e8690c011c4cfb39534074b.tar.gz | |
Add JSON Schema
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index b4f637c93e2..06b37aa4997 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -597,6 +597,10 @@ describe Projects::MergeRequestsController do format: 'json' end + it 'matches the schema' do + expect(response).to match_response_schema('conflicts') + end + it 'includes meta info about the MR' do expect(json_response['commit_message']).to include('Merge branch') expect(json_response['commit_sha']).to match(/\h{40}/) |