diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 15:22:04 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 15:22:04 +0100 |
commit | 15925290eec4f5616e12ef3169794f85150e3270 (patch) | |
tree | b1adb5784f74a05491a38b8656e179f451b79e5e /spec/controllers/projects/merge_requests_controller_spec.rb | |
parent | 0c3f70acf4838194f517c02874b8423303c21b48 (diff) | |
parent | 51ed5225adf4aac3ccbf715f8647258dac784abb (diff) | |
download | gitlab-ce-15925290eec4f5616e12ef3169794f85150e3270.tar.gz |
Merge branch 'master' into ui/dashboard-new-issueui/dashboard-new-issue
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 3e5e1fa87ae..6aaec224f6e 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -10,6 +10,30 @@ describe Projects::MergeRequestsController do project.team << [user, :master] end + describe '#new' do + context 'merge request that removes a submodule' do + render_views + + let(:fork_project) { create(:forked_project_with_submodules) } + + before do + fork_project.team << [user, :master] + end + + it 'renders it' do + get :new, + namespace_id: fork_project.namespace.to_param, + project_id: fork_project.to_param, + merge_request: { + source_branch: 'remove-submodule', + target_branch: 'master' + } + + expect(response).to be_success + end + end + end + describe "#show" do shared_examples "export merge as" do |format| it "should generally work" do |