diff options
author | Robert Speicher <rspeicher@gmail.com> | 2015-06-17 16:10:42 -0400 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2015-06-17 16:37:11 -0400 |
commit | 5c78d7fce88457dd1ebdd53b832b15303715faa7 (patch) | |
tree | 1a580bff5783a5a9a7a140de6ab3d8a1d74fdb50 /spec/controllers/projects | |
parent | 7e31a369f55764a6bccab340b8a3827710623793 (diff) | |
download | gitlab-ce-5c78d7fce88457dd1ebdd53b832b15303715faa7.tar.gz |
Move Projects::MergeRequestsController spec to its correct location
Diffstat (limited to 'spec/controllers/projects')
-rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 101 |
1 files changed, 101 insertions, 0 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb new file mode 100644 index 00000000000..c94ef1629ae --- /dev/null +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -0,0 +1,101 @@ +require 'spec_helper' + +describe Projects::MergeRequestsController do + let(:project) { create(:project) } + let(:user) { create(:user) } + let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) } + + before do + sign_in(user) + project.team << [user, :master] + end + + describe "#show" do + shared_examples "export merge as" do |format| + it "should generally work" do + get(:show, namespace_id: project.namespace.to_param, + project_id: project.to_param, id: merge_request.iid, format: format) + + expect(response).to be_success + end + + it "should generate it" do + expect_any_instance_of(MergeRequest).to receive(:"to_#{format}") + + get(:show, namespace_id: project.namespace.to_param, + project_id: project.to_param, id: merge_request.iid, format: format) + end + + it "should render it" do + get(:show, namespace_id: project.namespace.to_param, + project_id: project.to_param, id: merge_request.iid, format: format) + + expect(response.body).to eq((merge_request.send(:"to_#{format}",user)).to_s) + end + + it "should not escape Html" do + allow_any_instance_of(MergeRequest).to receive(:"to_#{format}"). + and_return('HTML entities &<>" ') + + get(:show, namespace_id: project.namespace.to_param, + project_id: project.to_param, id: merge_request.iid, format: format) + + expect(response.body).to_not include('&') + expect(response.body).to_not include('>') + expect(response.body).to_not include('<') + expect(response.body).to_not include('"') + end + end + + describe "as diff" do + include_examples "export merge as", :diff + let(:format) { :diff } + + it "should really only be a git diff" do + get(:show, namespace_id: project.namespace.to_param, + project_id: project.to_param, id: merge_request.iid, format: format) + + expect(response.body).to start_with("diff --git") + end + end + + describe "as patch" do + include_examples "export merge as", :patch + let(:format) { :patch } + + it "should really be a git email patch with commit" do + get(:show, namespace_id: project.namespace.to_param, + project_id: project.to_param, id: merge_request.iid, format: format) + + expect(response.body[0..100]).to start_with("From #{merge_request.commits.last.id}") + end + + it "should contain git diffs" do + get(:show, namespace_id: project.namespace.to_param, + project_id: project.to_param, id: merge_request.iid, format: format) + + expect(response.body).to match(/^diff --git/) + end + end + end + + context '#diffs with forked projects with submodules' do + render_views + let(:project) { create(:project) } + let(:fork_project) { create(:forked_project_with_submodules) } + let(:merge_request) { create(:merge_request_with_diffs, source_project: fork_project, source_branch: 'add-submodule-version-bump', target_branch: 'master', target_project: project) } + + before do + fork_project.build_forked_project_link(forked_to_project_id: fork_project.id, forked_from_project_id: project.id) + fork_project.save + merge_request.reload + end + + it '#diffs' do + get(:diffs, namespace_id: project.namespace.to_param, + project_id: project.to_param, id: merge_request.iid, format: 'json') + expect(response).to be_success + expect(response.body).to have_content('Subproject commit') + end + end +end |