Handle errs without notices. Userful for testing custom clients and different tests.

Nick Recobra
1 parent 4d9bc87e
Showing 6 changed files with 48 additions and 33 deletions Show diff stats
app/helpers/errs_helper.rb
app/models/err.rb
app/views/errs/_table.html.haml
app/views/errs/show.html.haml
spec/controllers/apps_controller_spec.rb
spec/controllers/errs_controller_spec.rb
@@ -0,0 +1,7 @@
+module ErrsHelper
+  
+  def last_notice_at err
+    err.last_notice_at || err.created_at
+  end
+  
+end
 \ No newline at end of file
@@ -45,7 +45,7 @@ class Err
   end
   def message
-    notices.first.message || klass
+    notices.first.try(:message) || klass
   end
 end
 \ No newline at end of file
@@ -15,11 +15,11 @@
         %td.message
           = link_to err.message, app_err_path(err.app, err)
           %em= err.where
-        %td.latest #{time_ago_in_words(err.last_notice_at)} ago
+        %td.latest #{time_ago_in_words(last_notice_at err)} ago
         %td.deploy= err.app.last_deploy_at ? err.app.last_deploy_at.to_s(:micro) : 'n/a'
         %td.count= link_to err.notices.count, app_err_path(err.app, err)
     - if errs.none?
       %tr
         %td{:colspan => (@app ? 5 : 6)}
           %em No errs here
-= will_paginate @errs, :previous_label => '&laquo; Previous', :next_label => 'Next &raquo;'
 \ No newline at end of file
+= will_paginate @errs, :previous_label => '&laquo; Previous', :next_label => 'Next &raquo;'
@@ -6,11 +6,11 @@
   %strong Environment:
   = @err.environment
   %strong Last Notice:
-  = @err.last_notice_at.to_s(:micro)
+  = last_notice_at(@err).to_s(:micro)
 - content_for :action_bar do
   %span= link_to 'resolve', resolve_app_err_path(@app, @err), :method => :put, :confirm => 'Seriously?', :class => 'resolve' if @err.unresolved?
-%h4= @notice.message
+%h4= @notice.try(:message)
 = will_paginate @notices, :param_name => :notice, :page_links => false, :class => 'notice-pagination'
 viewing occurrence #{@notices.current_page} of #{@notices.total_pages}
@@ -23,22 +23,23 @@ viewing occurrence #{@notices.current_page} of #{@notices.total_pages}
     %li= link_to 'Parameters', '#params', :rel => 'params', :class => 'button'
     %li= link_to 'Session', '#session', :rel => 'session', :class => 'button'
-#summary
-  %h3 Summary
-  = render 'notices/summary', :notice => @notice
-
-#backtrace
-  %h3 Backtrace
-  = render 'notices/backtrace', :lines => @notice.backtrace
+- if @notice
+  #summary
+    %h3 Summary
+    = render 'notices/summary', :notice => @notice
-#environment
-  %h3 Environment
-  = render 'notices/environment', :notice => @notice
-
-#params
-  %h3 Parameters
-  = render 'notices/params', :notice => @notice
-
-#session
-  %h3 Session
-  = render 'notices/session', :notice => @notice
 \ No newline at end of file
+  #backtrace
+    %h3 Backtrace
+    = render 'notices/backtrace', :lines => @notice.backtrace
+    
+  #environment
+    %h3 Environment
+    = render 'notices/environment', :notice => @notice
+  
+  #params
+    %h3 Parameters
+    = render 'notices/params', :notice => @notice
+  
+  #session
+    %h3 Session
+    = render 'notices/session', :notice => @notice
@@ -32,12 +32,21 @@ describe AppsController do
   end
   describe "GET /apps/:id" do
+    render_views
     context 'logged in as an admin' do
-      it 'finds the app' do
+      before(:each) do
         sign_in Factory(:admin)
-        app = Factory(:app)
-        get :show, :id => app.id
-        assigns(:app).should == app
+        @app = Factory(:app)
+      end
+
+      it 'finds the app' do
+        get :show, :id => @app.id
+        assigns(:app).should == @app
+      end
+
+      it "should not raise errors for app with err without notices" do
+        Factory :err, :app => @app
+        lambda { get :show, :id => @app.id }.should_not raise_error
       end
     end
@@ -74,6 +74,8 @@ describe ErrsController do
   end
   describe "GET /apps/:app_id/errs/:id" do
+    render_views
+    
     before do
       3.times { Factory(:notice, :err => err)}
     end
@@ -93,13 +95,9 @@ describe ErrsController do
         assigns(:err).should == err
       end
-      it "paginates the notices, 1 at a time" do
-        App.stub(:find).with(app.id).and_return(app)
-        app.errs.stub(:find).with(err.id).and_return(err)
-        err.notices.should_receive(:ordered).and_return(proxy = stub('proxy'))
-        proxy.should_receive(:paginate).with(:page => 3, :per_page => 1).
-          and_return(WillPaginate::Collection.new(1,1) << err.notices.first)
+      it "successfully render page" do
         get :show, :app_id => app.id, :id => err.id
+        response.should be_success
       end
     end
	@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
		1	+module ErrsHelper
		2	+
		3	+ def last_notice_at err
		4	+ err.last_notice_at \|\| err.created_at
		5	+ end
		6	+
		7	+end
0	\ No newline at end of file	8	\ No newline at end of file
	@@ -45,7 +45,7 @@ class Err		@@ -45,7 +45,7 @@ class Err
45	end	45	end
46		46
47	def message	47	def message
48	- notices.first.message \|\| klass	48	+ notices.first.try(:message) \|\| klass
49	end	49	end
50		50
51	end	51	end
52	\ No newline at end of file	52	\ No newline at end of file