diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-04 17:31:01 -0200 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-04 17:35:14 -0200 |
commit | 12fdc13ad386299b04431c43c7d4ab307698b1a8 (patch) | |
tree | 824eb97c41c4218d20a60eadb292f0e3cde36456 /spec/controllers/commit_controller_spec.rb | |
parent | e7e22ece5a63d15c221a73cd544ae83a33770bfe (diff) | |
download | gitlab-ce-12fdc13ad386299b04431c43c7d4ab307698b1a8.tar.gz |
Fix 500 error when creating a merge request that removes a submodule
Diffstat (limited to 'spec/controllers/commit_controller_spec.rb')
-rw-r--r-- | spec/controllers/commit_controller_spec.rb | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/spec/controllers/commit_controller_spec.rb b/spec/controllers/commit_controller_spec.rb index 5337a69e84b..7793bf1e421 100644 --- a/spec/controllers/commit_controller_spec.rb +++ b/spec/controllers/commit_controller_spec.rb @@ -110,6 +110,26 @@ describe Projects::CommitController do expect(response.body).to match(/^diff --git/) end end + + context 'commit that removes a submodule' do + render_views + + let(:fork_project) { create(:forked_project_with_submodules) } + let(:commit) { fork_project.commit('remove-submodule') } + + before do + fork_project.team << [user, :master] + end + + it 'renders it' do + get(:show, + namespace_id: fork_project.namespace.to_param, + project_id: fork_project.to_param, + id: commit.id) + + expect(response).to be_success + end + end end describe "#branches" do |