Merge branch 'comments_on_errors'

Nathan Broadbent
2 parents 75adfadc ba841cd1
Showing 14 changed files with 242 additions and 18 deletions Show diff stats
app/controllers/errs_controller.rb
app/helpers/application_helper.rb
app/models/comment.rb
app/models/err.rb
app/views/apps/_fields.html.haml
app/views/errs/show.html.haml
app/views/layouts/application.html.haml
config/routes.rb
public/stylesheets/application.css
spec/controllers/errs_controller_spec.rb
spec/factories/comment_factories.rb
spec/factories/err_factories.rb
spec/models/comment_spec.rb
spec/views/errs/show.html.haml_spec.rb
@@ -27,6 +27,7 @@ class ErrsController &lt; ApplicationController
     page      = 1 if page.to_i.zero?
     @notices  = @err.notices.ordered.paginate(:page => page, :per_page => 1)
     @notice   = @notices.first
+    @comment = Comment.new
   end
   def create_issue
@@ -62,6 +63,30 @@ class ErrsController &lt; ApplicationController
     redirect_to app_path(@app)
   end
+
+  def create_comment
+    @comment = Comment.new(params[:comment].merge(:user_id => current_user.id))
+    if @comment.valid?
+      @err.comments << @comment
+      @err.save
+      flash[:success] = "Comment saved!"
+    else
+      flash[:error] = "I'm sorry, your comment was blank! Try again?"
+    end
+    redirect_to app_err_path(@app, @err)
+  end
+
+  def destroy_comment
+    @comment = Comment.find(params[:comment_id])
+    if @comment.destroy
+      flash[:success] = "Comment deleted!"
+    else
+      flash[:error] = "Sorry, I couldn't delete your comment for some reason. I hope you don't have any sensitive information in there!"
+    end
+    redirect_to app_err_path(@app, @err)
+  end
+
+
   protected
     def find_app
@@ -83,3 +108,4 @@ class ErrsController &lt; ApplicationController
     end
 end
+
 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
+
@@ -0,0 +1,13 @@
+class Comment
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :body, :type => String
+  index :user_id
+
+  belongs_to :err
+  belongs_to :user
+
+  validates_presence_of :body
+end
+
@@ -18,6 +18,7 @@ class Err
   belongs_to :app
   has_many :notices
+  has_many :comments, :inverse_of => :err, :dependent => :destroy
   validates_presence_of :klass, :environment
@@ -51,3 +52,4 @@ class Err
   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"
@@ -20,6 +20,25 @@
   - if @err.unresolved?
     %span= link_to 'resolve', resolve_app_err_path(@app, @err), :method => :put, :confirm => err_confirm, :class => 'resolve'
+- 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)
 = will_paginate @notices, :param_name => :notice, :page_links => false, :class => 'notice-pagination'
@@ -53,3 +72,4 @@ viewing occurrence #{@notices.current_page} of #{@notices.total_pages}
   #session
     %h3 Session
     = render 'notices/session', :notice => @notice
+
@@ -28,5 +28,9 @@
       #content
         = render :partial => 'shared/flash_messages'
         = yield
+      - if content_for?(:comments)
+        #content-comments
+          = yield :comments
     #footer= "Powered by #{link_to 'Errbit', 'http://github.com/jdpace/errbit', :target => '_blank'}: the open source error catcher.".html_safe
     = yield :scripts
+
@@ -22,6 +22,8 @@ Errbit::Application.routes.draw do
         put :resolve
         post :create_issue
         delete :unlink_issue
+        post :create_comment
+        delete :destroy_comment
       end
     end
@@ -33,3 +35,4 @@ Errbit::Application.routes.draw do
   root :to => 'apps#index'
 end
+
@@ -139,14 +139,17 @@ a.action  { float: right; font-size: 0.9em;}
   border: 1px solid #C6C6C6;
 }
-/* Content Title */
-#content-title {
+/* Content Title and Comments */
+#content-title, #content-comments {
   padding: 30px 20px;
   border-top: 1px solid #FFF;
   border-bottom: 1px solid #FFF;
   background-color: #e2e2e2;
 }
-#content-title h1 {
+#content-comments {
+  background-color: #ffffff;
+}
+#content-title h1, #content-comments h3 {
   padding: 0; margin: 0;
   width: 85%;
   border: none;
@@ -154,6 +157,11 @@ a.action  { float: right; font-size: 0.9em;}
   font-size: 2em; line-height: 1em; font-weight: bold; font-family: arial, sans-serif;
   word-wrap: break-word;
 }
+#content-comments h3 {
+  font-size: 1.5em;
+  margin-bottom: 14px;
+}
+
 #content-title .meta { font-size: 0.9em; color: #787878; }
 /* Action Bar */
@@ -610,6 +618,7 @@ table.tally th.value {
   text-transform:none;
 }
+
 /* Resolve Errs */
 #action-bar a.resolve {
   background: transparent url(images/icons/thumbs-up.png) 6px 5px no-repeat;
@@ -694,3 +703,28 @@ span.click_span {
   display: none;
 }
+/* Comments */
+#content-comments form p {
+  margin: 30px 0 0 0;
+  text-transform: uppercase;
+}
+table.comment tbody th {
+  text-transform: none;
+  font-weight: normal;
+  height: 20px;
+  line-height: 0.5em;
+}
+table.comment tbody td {
+  background-color: #F9F9F9;
+}
+#content-comments a.destroy-comment {
+  color: #EE0000;
+  margin-right: 5px;
+}
+#content-comments a.destroy-comment:hover {
+  text-decoration: none;
+}
+#content-comments #comment_submit {
+  margin-top: 15px;
+}
+
@@ -437,4 +437,60 @@ describe ErrsController do
       end
     end
   end
+
+
+  describe "POST /apps/:app_id/errs/:id/create_comment" do
+    render_views
+
+    before(:each) do
+      sign_in Factory(:admin)
+    end
+
+    context "successful comment creation" do
+      let(:err) { Factory(:err) }
+      let(:user) { Factory(:user) }
+
+      before(:each) do
+        post :create_comment, :app_id => err.app.id, :id => err.id,
+             :comment => { :body => "One test comment", :user_id => user.id }
+        err.reload
+      end
+
+      it "should create the comment" do
+        err.comments.size.should == 1
+      end
+
+      it "should redirect to err page" do
+        response.should redirect_to( app_err_path(err.app, err) )
+      end
+    end
+  end
+
+  describe "DELETE /apps/:app_id/errs/:id/destroy_comment" do
+    render_views
+
+    before(:each) do
+      sign_in Factory(:admin)
+    end
+
+    context "successful comment deletion" do
+      let(:err) { Factory :err_with_comments }
+      let(:comment) { err.comments.first }
+
+      before(:each) do
+        delete :destroy_comment, :app_id => err.app.id, :id => err.id, :comment_id => comment.id
+        err.reload
+      end
+
+      it "should delete the comment" do
+        err.comments.detect{|c| c.id.to_s == comment.id }.should == nil
+      end
+
+      it "should redirect to err page" do
+        response.should redirect_to( app_err_path(err.app, err) )
+      end
+    end
+  end
+
 end
+
@@ -0,0 +1,5 @@
+Factory.define :comment do |c|
+  c.user       {|u| u.association :user}
+  c.body       'Test comment'
+end
+
@@ -4,6 +4,11 @@ Factory.define :err do |e|
   e.component     'foo'
   e.action        'bar'
   e.environment   'production'
+  e.comments      []
+end
+
+Factory.define(:err_with_comments, :parent => :err) do |ec|
+  ec.comments     { (1..3).map{Factory(:comment)} }
 end
 Factory.define :notice do |n|
@@ -22,4 +27,5 @@ def random_backtrace
     'method'  => ActiveSupport.methods.shuffle.first
   }}
   backtrace
-end
 \ No newline at end of file
+end
+
@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Comment do
+  context 'validations' do
+    it 'should require a body' do
+      comment = Factory.build(:comment, :body => nil)
+      comment.should_not be_valid
+      comment.errors[:body].should include("can't be blank")
+    end
+  end
+end
+
 require 'spec_helper'
-describe "errs/show.html.erb" do 
-  before do 
+describe "errs/show.html.erb" do
+  before do
     err = Factory(:err)
+    comment = Factory(:comment)
     assign :err, err
+    assign :comment, comment
     assign :app, err.app
     assign :notices, err.notices.ordered.paginate(:page => 1, :per_page => 1)
     assign :notice, err.notices.first
@@ -12,7 +14,7 @@ describe &quot;errs/show.html.erb&quot; do
   describe "content_for :action_bar" do
     it "should confirm the 'resolve' link by default" do
-      render 
+      render
       action_bar = String.new(view.instance_variable_get(:@_content_for)[:action_bar])
       resolve_link = action_bar.match(/(<a href.*?(class="resolve").*?>)/)[0]
       resolve_link.should =~ /data-confirm="Seriously\?"/
@@ -20,7 +22,7 @@ describe &quot;errs/show.html.erb&quot; do
     it "should confirm the 'resolve' link if configuration is unset" do
       Errbit::Config.stub(:confirm_resolve_err).and_return(nil)
-      render 
+      render
       action_bar = String.new(view.instance_variable_get(:@_content_for)[:action_bar])
       resolve_link = action_bar.match(/(<a href.*?(class="resolve").*?>)/)[0]
       resolve_link.should =~ /data-confirm="Seriously\?"/
@@ -28,7 +30,7 @@ describe &quot;errs/show.html.erb&quot; do
     it "should not confirm the 'resolve' link if configured not to" do
       Errbit::Config.stub(:confirm_resolve_err).and_return(false)
-      render 
+      render
       action_bar = String.new(view.instance_variable_get(:@_content_for)[:action_bar])
       resolve_link = action_bar.match(/(<a href.*?(class="resolve").*?>)/)[0]
       resolve_link.should_not =~ /data-confirm=/
@@ -36,4 +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
+
	@@ -27,6 +27,7 @@ class ErrsController < ApplicationController		@@ -27,6 +27,7 @@ class ErrsController < ApplicationController
27	page = 1 if page.to_i.zero?	27	page = 1 if page.to_i.zero?
28	@notices = @err.notices.ordered.paginate(:page => page, :per_page => 1)	28	@notices = @err.notices.ordered.paginate(:page => page, :per_page => 1)
29	@notice = @notices.first	29	@notice = @notices.first
		30	+ @comment = Comment.new
30	end	31	end
31		32
32	def create_issue	33	def create_issue
	@@ -62,6 +63,30 @@ class ErrsController < ApplicationController		@@ -62,6 +63,30 @@ class ErrsController < ApplicationController
62	redirect_to app_path(@app)	63	redirect_to app_path(@app)
63	end	64	end
64		65
		66	+
		67	+ def create_comment
		68	+ @comment = Comment.new(params[:comment].merge(:user_id => current_user.id))
		69	+ if @comment.valid?
		70	+ @err.comments << @comment
		71	+ @err.save
		72	+ flash[:success] = "Comment saved!"
		73	+ else
		74	+ flash[:error] = "I'm sorry, your comment was blank! Try again?"
		75	+ end
		76	+ redirect_to app_err_path(@app, @err)
		77	+ end
		78	+
		79	+ def destroy_comment
		80	+ @comment = Comment.find(params[:comment_id])
		81	+ if @comment.destroy
		82	+ flash[:success] = "Comment deleted!"
		83	+ else
		84	+ flash[:error] = "Sorry, I couldn't delete your comment for some reason. I hope you don't have any sensitive information in there!"
		85	+ end
		86	+ redirect_to app_err_path(@app, @err)
		87	+ end
		88	+
		89	+
65	protected	90	protected
66		91
67	def find_app	92	def find_app
	@@ -83,3 +108,4 @@ class ErrsController < ApplicationController		@@ -83,3 +108,4 @@ class ErrsController < ApplicationController
83	end	108	end
84		109
85	end	110	end
		111	+
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+class Comment
	2	+ include Mongoid::Document
	3	+ include Mongoid::Timestamps
	4	+
	5	+ field :body, :type => String
	6	+ index :user_id
	7	+
	8	+ belongs_to :err
	9	+ belongs_to :user
	10	+
	11	+ validates_presence_of :body
	12	+end
	13	+
	@@ -20,6 +20,25 @@		@@ -20,6 +20,25 @@
20	- if @err.unresolved?	20	- if @err.unresolved?
21	%span= link_to 'resolve', resolve_app_err_path(@app, @err), :method => :put, :confirm => err_confirm, :class => 'resolve'	21	%span= link_to 'resolve', resolve_app_err_path(@app, @err), :method => :put, :confirm => err_confirm, :class => 'resolve'
22		22
		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"
		41	+
23	%h4= @notice.try(:message)	42	%h4= @notice.try(:message)
24		43
25	= will_paginate @notices, :param_name => :notice, :page_links => false, :class => 'notice-pagination'	44	= will_paginate @notices, :param_name => :notice, :page_links => false, :class => 'notice-pagination'
	@@ -53,3 +72,4 @@ viewing occurrence #{@notices.current_page} of #{@notices.total_pages}		@@ -53,3 +72,4 @@ viewing occurrence #{@notices.current_page} of #{@notices.total_pages}
53	#session	72	#session
54	%h3 Session	73	%h3 Session
55	= render 'notices/session', :notice => @notice	74	= render 'notices/session', :notice => @notice
		75	+
	@@ -139,14 +139,17 @@ a.action { float: right; font-size: 0.9em;}		@@ -139,14 +139,17 @@ a.action { float: right; font-size: 0.9em;}
139	border: 1px solid #C6C6C6;	139	border: 1px solid #C6C6C6;
140	}	140	}
141		141
142	-/* Content Title */
143	-#content-title {	142	+/* Content Title and Comments */
		143	+#content-title, #content-comments {
144	padding: 30px 20px;	144	padding: 30px 20px;
145	border-top: 1px solid #FFF;	145	border-top: 1px solid #FFF;
146	border-bottom: 1px solid #FFF;	146	border-bottom: 1px solid #FFF;
147	background-color: #e2e2e2;	147	background-color: #e2e2e2;
148	}	148	}
149	-#content-title h1 {	149	+#content-comments {
		150	+ background-color: #ffffff;
		151	+}
		152	+#content-title h1, #content-comments h3 {
150	padding: 0; margin: 0;	153	padding: 0; margin: 0;
151	width: 85%;	154	width: 85%;
152	border: none;	155	border: none;
	@@ -154,6 +157,11 @@ a.action { float: right; font-size: 0.9em;}		@@ -154,6 +157,11 @@ a.action { float: right; font-size: 0.9em;}
154	font-size: 2em; line-height: 1em; font-weight: bold; font-family: arial, sans-serif;	157	font-size: 2em; line-height: 1em; font-weight: bold; font-family: arial, sans-serif;
155	word-wrap: break-word;	158	word-wrap: break-word;
156	}	159	}
		160	+#content-comments h3 {
		161	+ font-size: 1.5em;
		162	+ margin-bottom: 14px;
		163	+}
		164	+
157	#content-title .meta { font-size: 0.9em; color: #787878; }	165	#content-title .meta { font-size: 0.9em; color: #787878; }
158		166
159	/* Action Bar */	167	/* Action Bar */
	@@ -610,6 +618,7 @@ table.tally th.value {		@@ -610,6 +618,7 @@ table.tally th.value {
610	text-transform:none;	618	text-transform:none;
611	}	619	}
612		620
		621	+
613	/* Resolve Errs */	622	/* Resolve Errs */
614	#action-bar a.resolve {	623	#action-bar a.resolve {
615	background: transparent url(images/icons/thumbs-up.png) 6px 5px no-repeat;	624	background: transparent url(images/icons/thumbs-up.png) 6px 5px no-repeat;
	@@ -694,3 +703,28 @@ span.click_span {		@@ -694,3 +703,28 @@ span.click_span {
694	display: none;	703	display: none;
695	}	704	}
696		705
		706	+/* Comments */
		707	+#content-comments form p {
		708	+ margin: 30px 0 0 0;
		709	+ text-transform: uppercase;
		710	+}
		711	+table.comment tbody th {
		712	+ text-transform: none;
		713	+ font-weight: normal;
		714	+ height: 20px;
		715	+ line-height: 0.5em;
		716	+}
		717	+table.comment tbody td {
		718	+ background-color: #F9F9F9;
		719	+}
		720	+#content-comments a.destroy-comment {
		721	+ color: #EE0000;
		722	+ margin-right: 5px;
		723	+}
		724	+#content-comments a.destroy-comment:hover {
		725	+ text-decoration: none;
		726	+}
		727	+#content-comments #comment_submit {
		728	+ margin-top: 15px;
		729	+}
		730	+
	@@ -437,4 +437,60 @@ describe ErrsController do		@@ -437,4 +437,60 @@ describe ErrsController do
437	end	437	end
438	end	438	end
439	end	439	end
		440	+
		441	+
		442	+ describe "POST /apps/:app_id/errs/:id/create_comment" do
		443	+ render_views
		444	+
		445	+ before(:each) do
		446	+ sign_in Factory(:admin)
		447	+ end
		448	+
		449	+ context "successful comment creation" do
		450	+ let(:err) { Factory(:err) }
		451	+ let(:user) { Factory(:user) }
		452	+
		453	+ before(:each) do
		454	+ post :create_comment, :app_id => err.app.id, :id => err.id,
		455	+ :comment => { :body => "One test comment", :user_id => user.id }
		456	+ err.reload
		457	+ end
		458	+
		459	+ it "should create the comment" do
		460	+ err.comments.size.should == 1
		461	+ end
		462	+
		463	+ it "should redirect to err page" do
		464	+ response.should redirect_to( app_err_path(err.app, err) )
		465	+ end
		466	+ end
		467	+ end
		468	+
		469	+ describe "DELETE /apps/:app_id/errs/:id/destroy_comment" do
		470	+ render_views
		471	+
		472	+ before(:each) do
		473	+ sign_in Factory(:admin)
		474	+ end
		475	+
		476	+ context "successful comment deletion" do
		477	+ let(:err) { Factory :err_with_comments }
		478	+ let(:comment) { err.comments.first }
		479	+
		480	+ before(:each) do
		481	+ delete :destroy_comment, :app_id => err.app.id, :id => err.id, :comment_id => comment.id
		482	+ err.reload
		483	+ end
		484	+
		485	+ it "should delete the comment" do
		486	+ err.comments.detect{\|c\| c.id.to_s == comment.id }.should == nil
		487	+ end
		488	+
		489	+ it "should redirect to err page" do
		490	+ response.should redirect_to( app_err_path(err.app, err) )
		491	+ end
		492	+ end
		493	+ end
		494	+
440	end	495	end
		496	+
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+Factory.define :comment do \|c\|
	2	+ c.user {\|u\| u.association :user}
	3	+ c.body 'Test comment'
	4	+end
	5	+
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+require 'spec_helper'
	2	+
	3	+describe Comment do
	4	+ context 'validations' do
	5	+ it 'should require a body' do
	6	+ comment = Factory.build(:comment, :body => nil)
	7	+ comment.should_not be_valid
	8	+ comment.errors[:body].should include("can't be blank")
	9	+ end
	10	+ end
	11	+end
	12	+
1	require 'spec_helper'	1	require 'spec_helper'
2		2
3	-describe "errs/show.html.erb" do
4	- before do	3	+describe "errs/show.html.erb" do
		4	+ before do
5	err = Factory(:err)	5	err = Factory(:err)
		6	+ comment = Factory(:comment)
6	assign :err, err	7	assign :err, err
		8	+ assign :comment, comment
7	assign :app, err.app	9	assign :app, err.app
8	assign :notices, err.notices.ordered.paginate(:page => 1, :per_page => 1)	10	assign :notices, err.notices.ordered.paginate(:page => 1, :per_page => 1)
9	assign :notice, err.notices.first	11	assign :notice, err.notices.first
	@@ -12,7 +14,7 @@ describe "errs/show.html.erb" do		@@ -12,7 +14,7 @@ describe "errs/show.html.erb" do
12	describe "content_for :action_bar" do	14	describe "content_for :action_bar" do
13		15
14	it "should confirm the 'resolve' link by default" do	16	it "should confirm the 'resolve' link by default" do
15	- render	17	+ render
16	action_bar = String.new(view.instance_variable_get(:@_content_for)[:action_bar])	18	action_bar = String.new(view.instance_variable_get(:@_content_for)[:action_bar])
17	resolve_link = action_bar.match(/(<a href.?(class="resolve").?>)/)[0]	19	resolve_link = action_bar.match(/(<a href.?(class="resolve").?>)/)[0]
18	resolve_link.should =~ /data-confirm="Seriously\?"/	20	resolve_link.should =~ /data-confirm="Seriously\?"/
	@@ -20,7 +22,7 @@ describe "errs/show.html.erb" do		@@ -20,7 +22,7 @@ describe "errs/show.html.erb" do
20		22
21	it "should confirm the 'resolve' link if configuration is unset" do	23	it "should confirm the 'resolve' link if configuration is unset" do
22	Errbit::Config.stub(:confirm_resolve_err).and_return(nil)	24	Errbit::Config.stub(:confirm_resolve_err).and_return(nil)
23	- render	25	+ render
24	action_bar = String.new(view.instance_variable_get(:@_content_for)[:action_bar])	26	action_bar = String.new(view.instance_variable_get(:@_content_for)[:action_bar])
25	resolve_link = action_bar.match(/(<a href.?(class="resolve").?>)/)[0]	27	resolve_link = action_bar.match(/(<a href.?(class="resolve").?>)/)[0]
26	resolve_link.should =~ /data-confirm="Seriously\?"/	28	resolve_link.should =~ /data-confirm="Seriously\?"/
	@@ -28,7 +30,7 @@ describe "errs/show.html.erb" do		@@ -28,7 +30,7 @@ describe "errs/show.html.erb" do
28		30
29	it "should not confirm the 'resolve' link if configured not to" do	31	it "should not confirm the 'resolve' link if configured not to" do
30	Errbit::Config.stub(:confirm_resolve_err).and_return(false)	32	Errbit::Config.stub(:confirm_resolve_err).and_return(false)
31	- render	33	+ render
32	action_bar = String.new(view.instance_variable_get(:@_content_for)[:action_bar])	34	action_bar = String.new(view.instance_variable_get(:@_content_for)[:action_bar])
33	resolve_link = action_bar.match(/(<a href.?(class="resolve").?>)/)[0]	35	resolve_link = action_bar.match(/(<a href.?(class="resolve").?>)/)[0]
34	resolve_link.should_not =~ /data-confirm=/	36	resolve_link.should_not =~ /data-confirm=/
	@@ -36,4 +38,38 @@ describe "errs/show.html.erb" do		@@ -36,4 +38,38 @@ describe "errs/show.html.erb" do
36		38
37	end	39	end
38		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
39	end	74	end
		75	+