2016-08-12 17:24:09 -04:00
|
|
|
require 'spec_helper'
|
|
|
|
|
|
|
|
describe Projects::DiscussionsController do
|
2017-01-25 16:44:33 -05:00
|
|
|
let(:user) { create(:user) }
|
|
|
|
let(:merge_request) { create(:merge_request) }
|
|
|
|
let(:project) { merge_request.source_project }
|
2017-03-09 20:29:11 -05:00
|
|
|
let(:note) { create(:discussion_note_on_merge_request, noteable: merge_request, project: project) }
|
2016-08-15 19:45:23 -04:00
|
|
|
let(:discussion) { note.discussion }
|
|
|
|
|
|
|
|
let(:request_params) do
|
|
|
|
{
|
|
|
|
namespace_id: project.namespace,
|
|
|
|
project_id: project,
|
|
|
|
merge_request_id: merge_request,
|
|
|
|
id: note.discussion_id
|
|
|
|
}
|
|
|
|
end
|
2016-08-12 17:24:09 -04:00
|
|
|
|
|
|
|
describe 'POST resolve' do
|
|
|
|
before do
|
|
|
|
sign_in user
|
|
|
|
end
|
|
|
|
|
|
|
|
context "when the user is not authorized to resolve the discussion" do
|
|
|
|
it "returns status 404" do
|
2016-08-15 19:45:23 -04:00
|
|
|
post :resolve, request_params
|
2016-08-12 17:24:09 -04:00
|
|
|
|
2017-10-19 14:28:19 -04:00
|
|
|
expect(response).to have_gitlab_http_status(404)
|
2016-08-12 17:24:09 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context "when the user is authorized to resolve the discussion" do
|
|
|
|
before do
|
2017-12-22 03:18:28 -05:00
|
|
|
project.add_developer(user)
|
2016-08-12 17:24:09 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
context "when the discussion is not resolvable" do
|
|
|
|
before do
|
|
|
|
note.update(system: true)
|
|
|
|
end
|
|
|
|
|
|
|
|
it "returns status 404" do
|
2016-08-15 19:45:23 -04:00
|
|
|
post :resolve, request_params
|
2016-08-12 17:24:09 -04:00
|
|
|
|
2017-10-19 14:28:19 -04:00
|
|
|
expect(response).to have_gitlab_http_status(404)
|
2016-08-12 17:24:09 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context "when the discussion is resolvable" do
|
|
|
|
it "resolves the discussion" do
|
2016-08-15 19:45:23 -04:00
|
|
|
post :resolve, request_params
|
2016-08-12 17:24:09 -04:00
|
|
|
|
2016-08-15 19:45:23 -04:00
|
|
|
expect(note.reload.discussion.resolved?).to be true
|
|
|
|
expect(note.reload.discussion.resolved_by).to eq(user)
|
2016-08-12 17:24:09 -04:00
|
|
|
end
|
|
|
|
|
2016-08-15 19:45:23 -04:00
|
|
|
it "sends notifications if all discussions are resolved" do
|
|
|
|
expect_any_instance_of(MergeRequests::ResolvedDiscussionNotificationService).to receive(:execute).with(merge_request)
|
2016-08-12 17:24:09 -04:00
|
|
|
|
2016-08-15 19:45:23 -04:00
|
|
|
post :resolve, request_params
|
2016-08-12 17:24:09 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it "returns the name of the resolving user" do
|
2016-08-15 19:45:23 -04:00
|
|
|
post :resolve, request_params
|
2016-08-12 17:24:09 -04:00
|
|
|
|
|
|
|
expect(JSON.parse(response.body)["resolved_by"]).to eq(user.name)
|
|
|
|
end
|
|
|
|
|
|
|
|
it "returns status 200" do
|
2016-08-15 19:45:23 -04:00
|
|
|
post :resolve, request_params
|
2016-08-12 17:24:09 -04:00
|
|
|
|
2017-10-19 14:28:19 -04:00
|
|
|
expect(response).to have_gitlab_http_status(200)
|
2016-08-12 17:24:09 -04:00
|
|
|
end
|
2018-02-27 19:10:43 -05:00
|
|
|
|
|
|
|
context "when vue_mr_discussions cookie is present" do
|
|
|
|
before do
|
|
|
|
allow(controller).to receive(:cookies).and_return(vue_mr_discussions: 'true')
|
|
|
|
end
|
|
|
|
|
|
|
|
it "renders discussion with serializer" do
|
|
|
|
expect_any_instance_of(DiscussionSerializer).to receive(:represent)
|
|
|
|
.with(instance_of(Discussion), { context: instance_of(described_class) })
|
|
|
|
|
|
|
|
post :resolve, request_params
|
|
|
|
end
|
|
|
|
end
|
2016-08-12 17:24:09 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'DELETE unresolve' do
|
|
|
|
before do
|
|
|
|
sign_in user
|
2016-08-15 19:45:23 -04:00
|
|
|
|
|
|
|
note.discussion.resolve!(user)
|
2016-08-12 17:24:09 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
context "when the user is not authorized to resolve the discussion" do
|
|
|
|
it "returns status 404" do
|
2016-08-15 19:45:23 -04:00
|
|
|
delete :unresolve, request_params
|
2016-08-12 17:24:09 -04:00
|
|
|
|
2017-10-19 14:28:19 -04:00
|
|
|
expect(response).to have_gitlab_http_status(404)
|
2016-08-12 17:24:09 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context "when the user is authorized to resolve the discussion" do
|
|
|
|
before do
|
2017-12-22 03:18:28 -05:00
|
|
|
project.add_developer(user)
|
2016-08-12 17:24:09 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
context "when the discussion is not resolvable" do
|
|
|
|
before do
|
|
|
|
note.update(system: true)
|
|
|
|
end
|
|
|
|
|
|
|
|
it "returns status 404" do
|
2016-08-15 19:45:23 -04:00
|
|
|
delete :unresolve, request_params
|
2016-08-12 17:24:09 -04:00
|
|
|
|
2017-10-19 14:28:19 -04:00
|
|
|
expect(response).to have_gitlab_http_status(404)
|
2016-08-12 17:24:09 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context "when the discussion is resolvable" do
|
|
|
|
it "unresolves the discussion" do
|
2016-08-15 19:45:23 -04:00
|
|
|
delete :unresolve, request_params
|
2016-08-12 17:24:09 -04:00
|
|
|
|
2016-08-15 19:45:23 -04:00
|
|
|
expect(note.reload.discussion.resolved?).to be false
|
2016-08-12 17:24:09 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it "returns status 200" do
|
2016-08-15 19:45:23 -04:00
|
|
|
delete :unresolve, request_params
|
2016-08-12 17:24:09 -04:00
|
|
|
|
2017-10-19 14:28:19 -04:00
|
|
|
expect(response).to have_gitlab_http_status(200)
|
2016-08-12 17:24:09 -04:00
|
|
|
end
|
2018-02-27 19:10:43 -05:00
|
|
|
|
|
|
|
context "when vue_mr_discussions cookie is present" do
|
|
|
|
before do
|
|
|
|
allow(controller).to receive(:cookies).and_return({ vue_mr_discussions: 'true' })
|
|
|
|
end
|
|
|
|
|
|
|
|
it "renders discussion with serializer" do
|
|
|
|
expect_any_instance_of(DiscussionSerializer).to receive(:represent)
|
|
|
|
.with(instance_of(Discussion), { context: instance_of(described_class) })
|
|
|
|
|
|
|
|
delete :unresolve, request_params
|
|
|
|
end
|
|
|
|
end
|
2016-08-12 17:24:09 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|