support #371 close issue

Marvin Frederickson
1 parent ae91fcb5
Showing 7 changed files with 70 additions and 0 deletions Show diff stats
app/controllers/problems_controller.rb
app/models/issue.rb
app/models/issue_tracker.rb
app/views/problems/_issue_tracker_links.html.haml
config/routes.rb
spec/controllers/problems_controller_spec.rb
spec/errbit_plugin/mock_issue_tracker.rb
@@ -54,6 +54,13 @@ class ProblemsController &lt; ApplicationController
     @comment = Comment.new
   end
+  def close_issue
+    issue = Issue.new(problem: problem, user: current_user)
+    flash[:error] = issue.errors.full_messages.join(', ') unless issue.close
+
+    redirect_to app_problem_path(app, problem)
+  end
+
   def create_issue
     issue = Issue.new(problem: problem, user: current_user)
     issue.body = render_to_string(*issue.render_body_args)
@@ -26,6 +26,23 @@ class Issue
     end
   end
+  def close
+    errors.add :base, "This app has no issue tracker" unless issue_tracker
+    return false if errors.present?
+
+    tracker.errors.each { |k, err| errors.add k, err }
+    return false if errors.present?
+
+    if issue_tracker.respond_to? :close_issue
+      url = issue_tracker.close_issue(problem.issue_link, user: user.as_document)
+    end
+    
+    errors.empty?
+  rescue => ex
+    errors.add :base, "There was an error during issue closing: #{ex.message}"
+    false
+  end
+
   def save
     errors.add :base, "The issue has no body" unless body
     errors.add :base, "This app has no issue tracker" unless issue_tracker
@@ -36,5 +36,6 @@ class IssueTracker
   delegate :configured?, to: :tracker
   delegate :create_issue, to: :tracker
+  delegate :close_issue, to: :tracker
   delegate :url, to: :tracker
 end
@@ -6,6 +6,11 @@
       %img.button-icon{"src" => tracker_type.icons[:create]}
       = link_to 'go to issue', problem.issue_link, :class => "goto-issue"
     = link_to 'unlink issue', unlink_issue_app_problem_path(app, problem), :method => :delete, :data => { :confirm => "Unlink err issues?" }, :class => "unlink-issue"
+    - if tracker.tracker.respond_to? :close_issue
+      %span
+        = link_to close_issue_app_problem_path(app, problem), method: :post, :class => "close-issue" do
+          %img.button-icon{"src" => tracker_type.icons[:create]}
+          close issue
   - elsif problem.issue_link == "pending"
     %span.disabled
       %img.button-icon{"src" => tracker_type.icons[:inactive]}
@@ -42,6 +42,7 @@ Rails.application.routes.draw do
         put :resolve
         put :unresolve
         post :create_issue
+        post :close_issue
         delete :unlink_issue
       end
     end
@@ -262,6 +262,40 @@ describe ProblemsController, type: &#39;controller&#39; do
     end
   end
+  describe "POST /apps/:app_id/problems/:id/close_issue" do
+    before { sign_in user }
+
+    context "when app has a issue tracker" do
+      let(:notice) { NoticeDecorator.new(Fabricate :notice) }
+      let(:problem) { ProblemDecorator.new(notice.problem) }
+      let(:issue_tracker) do
+        Fabricate(:issue_tracker).tap do |t|
+          t.instance_variable_set(:@tracker, ErrbitPlugin::MockIssueTracker.new(t.options))
+        end
+      end
+
+      before do
+        problem.app.issue_tracker = issue_tracker
+        allow(controller).to receive(:problem).and_return(problem)
+        allow(controller).to receive(:current_user).and_return(user)
+      end
+
+      it "should redirect to problem page" do
+        post :close_issue, app_id: problem.app.id, id: problem.id
+        expect(response).to redirect_to(app_problem_path(problem.app, problem))
+        expect(flash[:error]).to be_blank
+      end
+    end
+
+    context "when app has no issue tracker" do
+      it "should redirect to problem page" do
+        post :close_issue, app_id: problem.app.id, id: problem.id
+        expect(response).to redirect_to(app_problem_path(problem.app, problem))
+        expect(flash[:error]).to eql "This app has no issue tracker"
+      end
+    end
+  end
+
   describe "DELETE /apps/:app_id/problems/:id/unlink_issue" do
     before(:each) do
       sign_in user
@@ -38,6 +38,11 @@ module ErrbitPlugin
       "http://example.com/mock-errbit"
     end
+    def close_issue(url, user)
+      @output << [url, user]
+      "http://example.com/mock-errbit"
+    end
+
     def url
       ''
     end
	@@ -54,6 +54,13 @@ class ProblemsController < ApplicationController		@@ -54,6 +54,13 @@ class ProblemsController < ApplicationController
54	@comment = Comment.new	54	@comment = Comment.new
55	end	55	end
56		56
		57	+ def close_issue
		58	+ issue = Issue.new(problem: problem, user: current_user)
		59	+ flash[:error] = issue.errors.full_messages.join(', ') unless issue.close
		60	+
		61	+ redirect_to app_problem_path(app, problem)
		62	+ end
		63	+
57	def create_issue	64	def create_issue
58	issue = Issue.new(problem: problem, user: current_user)	65	issue = Issue.new(problem: problem, user: current_user)
59	issue.body = render_to_string(*issue.render_body_args)	66	issue.body = render_to_string(*issue.render_body_args)
	@@ -26,6 +26,23 @@ class Issue		@@ -26,6 +26,23 @@ class Issue
26	end	26	end
27	end	27	end
28		28
		29	+ def close
		30	+ errors.add :base, "This app has no issue tracker" unless issue_tracker
		31	+ return false if errors.present?
		32	+
		33	+ tracker.errors.each { \|k, err\| errors.add k, err }
		34	+ return false if errors.present?
		35	+
		36	+ if issue_tracker.respond_to? :close_issue
		37	+ url = issue_tracker.close_issue(problem.issue_link, user: user.as_document)
		38	+ end
		39	+
		40	+ errors.empty?
		41	+ rescue => ex
		42	+ errors.add :base, "There was an error during issue closing: #{ex.message}"
		43	+ false
		44	+ end
		45	+
29	def save	46	def save
30	errors.add :base, "The issue has no body" unless body	47	errors.add :base, "The issue has no body" unless body
31	errors.add :base, "This app has no issue tracker" unless issue_tracker	48	errors.add :base, "This app has no issue tracker" unless issue_tracker
	@@ -36,5 +36,6 @@ class IssueTracker		@@ -36,5 +36,6 @@ class IssueTracker
36		36
37	delegate :configured?, to: :tracker	37	delegate :configured?, to: :tracker
38	delegate :create_issue, to: :tracker	38	delegate :create_issue, to: :tracker
		39	+ delegate :close_issue, to: :tracker
39	delegate :url, to: :tracker	40	delegate :url, to: :tracker
40	end	41	end
	@@ -262,6 +262,40 @@ describe ProblemsController, type: 'controller' do		@@ -262,6 +262,40 @@ describe ProblemsController, type: 'controller' do
262	end	262	end
263	end	263	end
264		264
		265	+ describe "POST /apps/:app_id/problems/:id/close_issue" do
		266	+ before { sign_in user }
		267	+
		268	+ context "when app has a issue tracker" do
		269	+ let(:notice) { NoticeDecorator.new(Fabricate :notice) }
		270	+ let(:problem) { ProblemDecorator.new(notice.problem) }
		271	+ let(:issue_tracker) do
		272	+ Fabricate(:issue_tracker).tap do \|t\|
		273	+ t.instance_variable_set(:@tracker, ErrbitPlugin::MockIssueTracker.new(t.options))
		274	+ end
		275	+ end
		276	+
		277	+ before do
		278	+ problem.app.issue_tracker = issue_tracker
		279	+ allow(controller).to receive(:problem).and_return(problem)
		280	+ allow(controller).to receive(:current_user).and_return(user)
		281	+ end
		282	+
		283	+ it "should redirect to problem page" do
		284	+ post :close_issue, app_id: problem.app.id, id: problem.id
		285	+ expect(response).to redirect_to(app_problem_path(problem.app, problem))
		286	+ expect(flash[:error]).to be_blank
		287	+ end
		288	+ end
		289	+
		290	+ context "when app has no issue tracker" do
		291	+ it "should redirect to problem page" do
		292	+ post :close_issue, app_id: problem.app.id, id: problem.id
		293	+ expect(response).to redirect_to(app_problem_path(problem.app, problem))
		294	+ expect(flash[:error]).to eql "This app has no issue tracker"
		295	+ end
		296	+ end
		297	+ end
		298	+
265	describe "DELETE /apps/:app_id/problems/:id/unlink_issue" do	299	describe "DELETE /apps/:app_id/problems/:id/unlink_issue" do
266	before(:each) do	300	before(:each) do
267	sign_in user	301	sign_in user