diff options
author | Ash McKenzie <amckenzie@gitlab.com> | 2018-06-05 14:42:18 +0300 |
---|---|---|
committer | Ash McKenzie <amckenzie@gitlab.com> | 2018-06-06 01:18:40 +0300 |
commit | bbafb85395cf2786f21a5a92745b9b3a181a4ce8 (patch) | |
tree | 38e135efa18036a6b76000e2d055241d60c66234 /spec/controllers | |
parent | a34666e655347f66fab578a134b568e997b7902e (diff) |
Add missing tests around rendering invalid merge requests (HTML+JSON)
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 6e8de6db9c3..6e710c9b20b 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -80,6 +80,16 @@ describe Projects::MergeRequestsController do )) end end + + context "that is invalid" do + let(:merge_request) { create(:invalid_merge_request, target_project: project, source_project: project) } + + it "renders merge request page" do + go(format: :html) + + expect(response).to be_success + end + end end describe 'as json' do @@ -106,6 +116,16 @@ describe Projects::MergeRequestsController do expect(response).to match_response_schema('entities/merge_request_widget') end end + + context "that is invalid" do + let(:merge_request) { create(:invalid_merge_request, target_project: project, source_project: project) } + + it "renders merge request page" do + go(format: :json) + + expect(response).to be_success + end + end end describe "as diff" do |