Comments are only enabled if app has no issue tracker configured.

Nathan Broadbent
1 parent c4549e91
Showing 4 changed files with 67 additions and 25 deletions Show diff stats
app/helpers/application_helper.rb
app/views/apps/_fields.html.haml
app/views/errs/show.html.haml
spec/views/errs/show.html.haml_spec.rb
 module ApplicationHelper
-  
-  
+
+
   def lighthouse_tracker? object
     object.issue_tracker_type == "lighthouseapp"
   end
-  
+
   def user_agent_graph(error)
     tallies = tally(error.notices) {|notice| pretty_user_agent(notice.user_agent)}
     create_percentage_table(tallies, :total => error.notices.count)
   end
-  
+
   def pretty_user_agent(user_agent)
     (user_agent.nil? || user_agent.none?) ? "N/A" : "#{user_agent.browser} #{user_agent.version}"
   end
-  
+
   def tally(collection, &block)
     collection.inject({}) do |tallies, item|
       value = yield item
@@ -21,7 +21,7 @@ module ApplicationHelper
       tallies
     end
   end
-  
+
   def create_percentage_table(tallies, options={})
     total   = (options[:total] || total_from_tallies(tallies))
     percent = 100.0 / total.to_f
@@ -29,12 +29,16 @@ module ApplicationHelper
                      .sort {|a, b| a[0] <=> b[0]}
     render :partial => "errs/tally_table", :locals => {:rows => rows}
   end
-  
+
   def total_from_tallies(tallies)
     tallies.values.inject(0) {|sum, n| sum + n}
   end
   private :total_from_tallies
-  
+
+  def no_tracker? object
+    object.issue_tracker_type == "none"
+  end
+
   def redmine_tracker? object
     object.issue_tracker_type == "redmine"
   end
@@ -47,3 +51,4 @@ module ApplicationHelper
     object.issue_tracker_type == 'fogbugz'
   end
 end
+
@@ -53,7 +53,7 @@
     %div.issue_tracker.nested
       %div.choose
         = w.radio_button :issue_tracker_type, :none
-        = label_tag :issue_tracker_type_lighthouseapp, '(None)', :for => label_for_attr(w, 'issue_tracker_type_none')
+        = label_tag :issue_tracker_type_none, '(None)', :for => label_for_attr(w, 'issue_tracker_type_none')
         = w.radio_button :issue_tracker_type, :lighthouseapp
         = label_tag :issue_tracker_type_lighthouseapp, 'Lighthouse', :for => label_for_attr(w, 'issue_tracker_type_lighthouseapp')
         = w.radio_button :issue_tracker_type, :redmine
@@ -62,6 +62,8 @@
         = label_tag :issue_tracker_type_pivotal, 'Pivotal Tracker', :for => label_for_attr(w, 'issue_tracker_type_pivotal')
         = w.radio_button :issue_tracker_type, :fogbugz
         = label_tag :issue_tracker_type_fogbugz, 'FogBugz', :for => label_for_attr(w, 'issue_tracker_type_fogbugz')
+      %div.tracker_params.none{:class => no_tracker?(w.object) ? 'chosen' : nil}
+        %p When no issue tracker has been configured, you will be able to leave comments on errors.
       %div.tracker_params.lighthouseapp{:class => lighthouse_tracker?(w.object) ? 'chosen' : nil}
         = w.label :account, "Account"
         = w.text_field :account, :placeholder => "abc from abc.lighthouseapp.com"
@@ -19,23 +19,25 @@
       = link_to 'unlink issue', unlink_issue_app_err_path(@app, @err), :method => :delete, :confirm => "Unlink err issues?", :class => "unlink-issue"
   - if @err.unresolved?
     %span= link_to 'resolve', resolve_app_err_path(@app, @err), :method => :put, :confirm => err_confirm, :class => 'resolve'
-- content_for :comments do
-  %h3 Comments on this Err
-  - @err.comments.each do |comment|
-    .window
-      %table.comment
-        %tr
-          %th
-            %span= link_to '&#10008;'.html_safe, destroy_comment_app_err_path(@app, @err) << "?comment_id=#{comment.id}", :method => :delete, :confirm => "Are sure you don't need this comment?", :class => "destroy-comment"
-            = time_ago_in_words(comment.created_at, true) << " ago by "
-            = link_to comment.user.email, user_path(comment.user)
-        %tr
-          %td= comment.body.gsub("\n", "<br>").html_safe
  
-  = form_for @comment, :url => create_comment_app_err_path(@app, @err) do |comment_form|
-    %p Add a comment
-    = comment_form.text_area :body, :style => "width: 420px; height: 80px;"
-    = comment_form.submit "Save Comment"
+- if !@app.issue_tracker_configured? || @err.comments.any?
+  - content_for :comments do
+    %h3 Comments on this Err
+    - @err.comments.each do |comment|
+      .window
+        %table.comment
+          %tr
+            %th
+              %span= link_to '&#10008;'.html_safe, destroy_comment_app_err_path(@app, @err) << "?comment_id=#{comment.id}", :method => :delete, :confirm => "Are sure you don't need this comment?", :class => "destroy-comment"
+              = time_ago_in_words(comment.created_at, true) << " ago by "
+              = link_to comment.user.email, user_path(comment.user)
+          %tr
+            %td= comment.body.gsub("\n", "<br>").html_safe
+    - unless @app.issue_tracker_configured?
+      = form_for @comment, :url => create_comment_app_err_path(@app, @err) do |comment_form|
+        %p Add a comment
+        = comment_form.text_area :body, :style => "width: 420px; height: 80px;"
+        = comment_form.submit "Save Comment"
  
 %h4= @notice.try(:message)
  
@@ -38,5 +38,38 @@ describe &quot;errs/show.html.erb&quot; do
  
   end
  
+  describe "content_for :comments" do
+    it 'should display comments and new comment form when no issue tracker' do
+      err = Factory(:err_with_comments)
+      assign :err, err
+      assign :app, err.app
+      render
+      comments_section = String.new(view.instance_variable_get(:@_content_for)[:comments])
+      comments_section.should =~ /Test comment/
+      comments_section.should =~ /Add a comment/
+    end
+
+    context "with issue tracker" do
+      def with_issue_tracker(err)
+        err.app.issue_tracker = IssueTracker.new :issue_tracker_type => "lighthouseapp", :project_id => "1234"
+        assign :err, err
+        assign :app, err.app
+      end
+
+      it 'should not display the comments section' do
+        with_issue_tracker(Factory(:err))
+        render
+        view.instance_variable_get(:@_content_for)[:comments].should be_blank
+      end
+
+      it 'should display existing comments' do
+        with_issue_tracker(Factory(:err_with_comments))
+        render
+        comments_section = String.new(view.instance_variable_get(:@_content_for)[:comments])
+        comments_section.should =~ /Test comment/
+        comments_section.should_not =~ /Add a comment/
+      end
+    end
+  end
 end
1	1	module ApplicationHelper
2		-
3		-
	2	+
	3	+
4	4	def lighthouse_tracker? object
5	5	object.issue_tracker_type == "lighthouseapp"
6	6	end
7		-
	7	+
8	8	def user_agent_graph(error)
9	9	tallies = tally(error.notices) {\|notice\| pretty_user_agent(notice.user_agent)}
10	10	create_percentage_table(tallies, :total => error.notices.count)
11	11	end
12		-
	12	+
13	13	def pretty_user_agent(user_agent)
14	14	(user_agent.nil? \|\| user_agent.none?) ? "N/A" : "#{user_agent.browser} #{user_agent.version}"
15	15	end
16		-
	16	+
17	17	def tally(collection, &block)
18	18	collection.inject({}) do \|tallies, item\|
19	19	value = yield item
...	...	@@ -21,7 +21,7 @@ module ApplicationHelper
21	21	tallies
22	22	end
23	23	end
24		-
	24	+
25	25	def create_percentage_table(tallies, options={})
26	26	total = (options[:total] \|\| total_from_tallies(tallies))
27	27	percent = 100.0 / total.to_f
...	...	@@ -29,12 +29,16 @@ module ApplicationHelper
29	29	.sort {\|a, b\| a[0] <=> b[0]}
30	30	render :partial => "errs/tally_table", :locals => {:rows => rows}
31	31	end
32		-
	32	+
33	33	def total_from_tallies(tallies)
34	34	tallies.values.inject(0) {\|sum, n\| sum + n}
35	35	end
36	36	private :total_from_tallies
37		-
	37	+
	38	+ def no_tracker? object
	39	+ object.issue_tracker_type == "none"
	40	+ end
	41	+
38	42	def redmine_tracker? object
39	43	object.issue_tracker_type == "redmine"
40	44	end
...	...	@@ -47,3 +51,4 @@ module ApplicationHelper
47	51	object.issue_tracker_type == 'fogbugz'
48	52	end
49	53	end
	54	+
...	...
...	...	@@ -53,7 +53,7 @@
53	53	%div.issue_tracker.nested
54	54	%div.choose
55	55	= w.radio_button :issue_tracker_type, :none
56		- = label_tag :issue_tracker_type_lighthouseapp, '(None)', :for => label_for_attr(w, 'issue_tracker_type_none')
	56	+ = label_tag :issue_tracker_type_none, '(None)', :for => label_for_attr(w, 'issue_tracker_type_none')
57	57	= w.radio_button :issue_tracker_type, :lighthouseapp
58	58	= label_tag :issue_tracker_type_lighthouseapp, 'Lighthouse', :for => label_for_attr(w, 'issue_tracker_type_lighthouseapp')
59	59	= w.radio_button :issue_tracker_type, :redmine
...	...	@@ -62,6 +62,8 @@
62	62	= label_tag :issue_tracker_type_pivotal, 'Pivotal Tracker', :for => label_for_attr(w, 'issue_tracker_type_pivotal')
63	63	= w.radio_button :issue_tracker_type, :fogbugz
64	64	= label_tag :issue_tracker_type_fogbugz, 'FogBugz', :for => label_for_attr(w, 'issue_tracker_type_fogbugz')
	65	+ %div.tracker_params.none{:class => no_tracker?(w.object) ? 'chosen' : nil}
	66	+ %p When no issue tracker has been configured, you will be able to leave comments on errors.
65	67	%div.tracker_params.lighthouseapp{:class => lighthouse_tracker?(w.object) ? 'chosen' : nil}
66	68	= w.label :account, "Account"
67	69	= w.text_field :account, :placeholder => "abc from abc.lighthouseapp.com"
...	...
...	...	@@ -19,23 +19,25 @@
19	19	= link_to 'unlink issue', unlink_issue_app_err_path(@app, @err), :method => :delete, :confirm => "Unlink err issues?", :class => "unlink-issue"
20	20	- if @err.unresolved?
21	21	%span= link_to 'resolve', resolve_app_err_path(@app, @err), :method => :put, :confirm => err_confirm, :class => 'resolve'
22		-- content_for :comments do
23		- %h3 Comments on this Err
24		- - @err.comments.each do \|comment\|
25		- .window
26		- %table.comment
27		- %tr
28		- %th
29		- %span= link_to '✘'.html_safe, destroy_comment_app_err_path(@app, @err) << "?comment_id=#{comment.id}", :method => :delete, :confirm => "Are sure you don't need this comment?", :class => "destroy-comment"
30		- = time_ago_in_words(comment.created_at, true) << " ago by "
31		- = link_to comment.user.email, user_path(comment.user)
32		- %tr
33		- %td= comment.body.gsub("\n", "<br>").html_safe
34	22
35		- = form_for @comment, :url => create_comment_app_err_path(@app, @err) do \|comment_form\|
36		- %p Add a comment
37		- = comment_form.text_area :body, :style => "width: 420px; height: 80px;"
38		- = comment_form.submit "Save Comment"
	23	+- if !@app.issue_tracker_configured? \|\| @err.comments.any?
	24	+ - content_for :comments do
	25	+ %h3 Comments on this Err
	26	+ - @err.comments.each do \|comment\|
	27	+ .window
	28	+ %table.comment
	29	+ %tr
	30	+ %th
	31	+ %span= link_to '✘'.html_safe, destroy_comment_app_err_path(@app, @err) << "?comment_id=#{comment.id}", :method => :delete, :confirm => "Are sure you don't need this comment?", :class => "destroy-comment"
	32	+ = time_ago_in_words(comment.created_at, true) << " ago by "
	33	+ = link_to comment.user.email, user_path(comment.user)
	34	+ %tr
	35	+ %td= comment.body.gsub("\n", "<br>").html_safe
	36	+ - unless @app.issue_tracker_configured?
	37	+ = form_for @comment, :url => create_comment_app_err_path(@app, @err) do \|comment_form\|
	38	+ %p Add a comment
	39	+ = comment_form.text_area :body, :style => "width: 420px; height: 80px;"
	40	+ = comment_form.submit "Save Comment"
39	41
40	42	%h4= @notice.try(:message)
41	43
...	...
...	...	@@ -38,5 +38,38 @@ describe "errs/show.html.erb" do
38	38
39	39	end
40	40
	41	+ describe "content_for :comments" do
	42	+ it 'should display comments and new comment form when no issue tracker' do
	43	+ err = Factory(:err_with_comments)
	44	+ assign :err, err
	45	+ assign :app, err.app
	46	+ render
	47	+ comments_section = String.new(view.instance_variable_get(:@_content_for)[:comments])
	48	+ comments_section.should =~ /Test comment/
	49	+ comments_section.should =~ /Add a comment/
	50	+ end
	51	+
	52	+ context "with issue tracker" do
	53	+ def with_issue_tracker(err)
	54	+ err.app.issue_tracker = IssueTracker.new :issue_tracker_type => "lighthouseapp", :project_id => "1234"
	55	+ assign :err, err
	56	+ assign :app, err.app
	57	+ end
	58	+
	59	+ it 'should not display the comments section' do
	60	+ with_issue_tracker(Factory(:err))
	61	+ render
	62	+ view.instance_variable_get(:@_content_for)[:comments].should be_blank
	63	+ end
	64	+
	65	+ it 'should display existing comments' do
	66	+ with_issue_tracker(Factory(:err_with_comments))
	67	+ render
	68	+ comments_section = String.new(view.instance_variable_get(:@_content_for)[:comments])
	69	+ comments_section.should =~ /Test comment/
	70	+ comments_section.should_not =~ /Add a comment/
	71	+ end
	72	+ end
	73	+ end
41	74	end
42	75
...	...