summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/notes_controller_spec.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-08-12 16:24:09 -0500
committerDouwe Maan <douwe@selenight.nl>2016-08-12 16:24:09 -0500
commite25720045988e59f7ddfecebbc02e640dc2f8360 (patch)
tree1555fa2bd5b07d3495032c1fdd0ecce6cb222254 /spec/controllers/projects/notes_controller_spec.rb
parentf48642e260e7cc733b619e34e47d6e67b484fee0 (diff)
downloadgitlab-ce-e25720045988e59f7ddfecebbc02e640dc2f8360.tar.gz
Add specs for NotesController and DiscussionsController
Diffstat (limited to 'spec/controllers/projects/notes_controller_spec.rb')
-rw-r--r--spec/controllers/projects/notes_controller_spec.rb106
1 files changed, 104 insertions, 2 deletions
diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb
index 75590c1ed4f..d57d5c0b963 100644
--- a/spec/controllers/projects/notes_controller_spec.rb
+++ b/spec/controllers/projects/notes_controller_spec.rb
@@ -1,4 +1,4 @@
-require('spec_helper')
+require 'spec_helper'
describe Projects::NotesController do
let(:user) { create(:user) }
@@ -6,7 +6,7 @@ describe Projects::NotesController do
let(:issue) { create(:issue, project: project) }
let(:note) { create(:note, noteable: issue, project: project) }
- describe 'POST #toggle_award_emoji' do
+ describe 'POST toggle_award_emoji' do
before do
sign_in(user)
project.team << [user, :developer]
@@ -33,4 +33,106 @@ describe Projects::NotesController do
expect(response).to have_http_status(200)
end
end
+
+ describe 'POST resolve' do
+ before do
+ sign_in user
+ end
+
+ context "when the user is not authorized to resolve the note" do
+ it "returns status 404" do
+ post :resolve, namespace_id: project.namespace.path, project_id: project.path, id: note.id
+
+ expect(response).to have_http_status(404)
+ end
+ end
+
+ context "when the user is authorized to resolve the note" do
+ before do
+ project.team << [user, :developer]
+ end
+
+ context "when the note is not resolvable" do
+ it "returns status 404" do
+ post :resolve, namespace_id: project.namespace.path, project_id: project.path, id: note.id
+
+ expect(response).to have_http_status(404)
+ end
+ end
+
+ context "when the note is resolvable" do
+ let(:merge_request) { create(:merge_request, source_project: project) }
+ let(:note) { create(:diff_note_on_merge_request, noteable: merge_request, project: project) }
+
+ it "resolves the note" do
+ expect_any_instance_of(DiffNote).to receive(:resolve!).with(user)
+
+ post :resolve, namespace_id: project.namespace.path, project_id: project.path, id: note.id
+ end
+
+ it "checks whether all notes are resolved" do
+ expect_any_instance_of(MergeRequests::AllDiscussionsResolvedService).to receive(:execute).with(merge_request)
+
+ post :resolve, namespace_id: project.namespace.path, project_id: project.path, id: note.id
+ end
+
+ it "returns the name of the resolving user" do
+ post :resolve, namespace_id: project.namespace.path, project_id: project.path, id: note.id
+
+ expect(JSON.parse(response.body)["resolved_by"]).to eq(user.name)
+ end
+
+ it "returns status 200" do
+ post :resolve, namespace_id: project.namespace.path, project_id: project.path, id: note.id
+
+ expect(response).to have_http_status(200)
+ end
+ end
+ end
+ end
+
+ describe 'DELETE unresolve' do
+ before do
+ sign_in user
+ end
+
+ context "when the user is not authorized to resolve the note" do
+ it "returns status 404" do
+ delete :unresolve, namespace_id: project.namespace.path, project_id: project.path, id: note.id
+
+ expect(response).to have_http_status(404)
+ end
+ end
+
+ context "when the user is authorized to resolve the note" do
+ before do
+ project.team << [user, :developer]
+ end
+
+ context "when the note is not resolvable" do
+ it "returns status 404" do
+ delete :unresolve, namespace_id: project.namespace.path, project_id: project.path, id: note.id
+
+ expect(response).to have_http_status(404)
+ end
+ end
+
+ context "when the note is resolvable" do
+ let(:merge_request) { create(:merge_request, source_project: project) }
+ let(:note) { create(:diff_note_on_merge_request, noteable: merge_request, project: project) }
+
+ it "unresolves the note" do
+ expect_any_instance_of(DiffNote).to receive(:unresolve!)
+
+ delete :unresolve, namespace_id: project.namespace.path, project_id: project.path, id: note.id
+ end
+
+ it "returns status 200" do
+ delete :unresolve, namespace_id: project.namespace.path, project_id: project.path, id: note.id
+
+ expect(response).to have_http_status(200)
+ end
+ end
+ end
+ end
end