Add specs for NotesController and DiscussionsController

3 files changed, 6 insertions, 2 deletions

diff --git a/app/controllers/projects/discussions_controller.rb b/app/controllers/projects/discussions_controller.rb
index 86e3f865c6f..502aa20d7b6 100644
--- a/app/controllers/projects/discussions_controller.rb
+++ b/app/controllers/projects/discussions_controller.rb
@@ -34,7 +34,7 @@ class Projects::DiscussionsController < Projects::ApplicationController
   end
 
   def discussion
-    @discussion ||= @merge_request.discussions.find { |d| d.id == params[:id] } || render_404
+    @discussion ||= @merge_request.find_discussion(params[:id]) || render_404
   end
 
   def authorize_resolve_discussion!
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb
index 1849311d26d..934a7961a63 100644
--- a/app/controllers/projects/notes_controller.rb
+++ b/app/controllers/projects/notes_controller.rb
@@ -5,7 +5,7 @@ class Projects::NotesController < Projects::ApplicationController
   before_action :authorize_read_note!
   before_action :authorize_create_note!, only: [:create]
   before_action :authorize_admin_note!, only: [:update, :destroy]
-  before_action :authorize_resolve_note!, only: [:resolve]
+  before_action :authorize_resolve_note!, only: [:resolve, :unresolve]
   before_action :find_current_user_notes, only: [:index]
 
   def index
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 1ab644a989a..cb0bb3b64ac 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -424,6 +424,10 @@ class MergeRequest < ActiveRecord::Base
       discussions
   end
 
+  def find_discussion(discussion_id)
+    discussions.find { |d| d.id == discussion_id }
+  end
+
   def discussions_resolvable?
     discussions.any?(&:resolvable?)
   end