Add errs#all to display resolved + unresolved errs

Jared Pace
1 parent 6aec6f2e
Showing 5 changed files with 30 additions and 2 deletions Show diff stats
app/controllers/errs_controller.rb
app/views/errs/all.html.haml
app/views/errs/index.html.haml
config/routes.rb
spec/controllers/errs_controller_spec.rb
@@ -4,6 +4,10 @@ class ErrsController &lt; ApplicationController
     @errs = Err.unresolved.ordered.paginate(:page => params[:page])
   end
  
+  def all
+    @errs = Err.ordered.paginate(:page => params[:page])
+  end
+  
   def show
     @project  = Project.find(params[:project_id])
     @err      = @project.errs.find(params[:id])
@@ -0,0 +1,5 @@
+- content_for :title, 'All Errors'
+- content_for :action_bar do
+  = will_paginate(@errs)
+  = link_to 'hide resolved', errs_path
+= render 'table', :errs => @errs
 \ No newline at end of file
 - content_for :title, 'Unresolved Errors'
-
+- content_for :action_bar do
+  = will_paginate(@errs)
+  = link_to 'show resolved', all_errs_path
 = render 'table', :errs => @errs
 \ No newline at end of file
@@ -4,7 +4,11 @@ Hypnotoad::Application.routes.draw do
   match '/notifier_api/v2/notices' => 'notices#create'
   match '/deploys.txt' => 'deploys#create'
  
-  resources :errs,    :only => [:index]
+  resources :errs,    :only => [:index] do
+    collection do
+      get :all
+    end
+  end
   resources :notices, :only => [:show]
   resources :deploys, :only => [:show]
  
@@ -17,6 +17,19 @@ describe ErrsController do
     end
   end
  
+  describe "GET /errs/all" do
+    it "gets a paginated list of all errors" do
+      errors = WillPaginate::Collection.new(1,30)
+      3.times { errors << Factory(:err) }
+      3.times { errors << Factory(:err, :resolved => true)}
+      Err.should_receive(:ordered).and_return(
+        mock('proxy', :paginate => errors)
+      )
+      get :index
+      assigns(:errs).should == errors
+    end
+  end
+  
   describe "GET /projects/:project_id/errs/:id" do
     before do
       3.times { Factory(:notice, :err => err)}
...	...	@@ -4,6 +4,10 @@ class ErrsController < ApplicationController
4	4	@errs = Err.unresolved.ordered.paginate(:page => params[:page])
5	5	end
6	6
	7	+ def all
	8	+ @errs = Err.ordered.paginate(:page => params[:page])
	9	+ end
	10	+
7	11	def show
8	12	@project = Project.find(params[:project_id])
9	13	@err = @project.errs.find(params[:id])
...	...
...	...	@@ -0,0 +1,5 @@
	1	+- content_for :title, 'All Errors'
	2	+- content_for :action_bar do
	3	+ = will_paginate(@errs)
	4	+ = link_to 'hide resolved', errs_path
	5	+= render 'table', :errs => @errs
0	6	\ No newline at end of file
...	...
1	1	- content_for :title, 'Unresolved Errors'
2		-
	2	+- content_for :action_bar do
	3	+ = will_paginate(@errs)
	4	+ = link_to 'show resolved', all_errs_path
3	5	= render 'table', :errs => @errs
4	6	\ No newline at end of file
...	...
...	...	@@ -4,7 +4,11 @@ Hypnotoad::Application.routes.draw do
4	4	match '/notifier_api/v2/notices' => 'notices#create'
5	5	match '/deploys.txt' => 'deploys#create'
6	6
7		- resources :errs, :only => [:index]
	7	+ resources :errs, :only => [:index] do
	8	+ collection do
	9	+ get :all
	10	+ end
	11	+ end
8	12	resources :notices, :only => [:show]
9	13	resources :deploys, :only => [:show]
10	14
...	...
...	...	@@ -17,6 +17,19 @@ describe ErrsController do
17	17	end
18	18	end
19	19
	20	+ describe "GET /errs/all" do
	21	+ it "gets a paginated list of all errors" do
	22	+ errors = WillPaginate::Collection.new(1,30)
	23	+ 3.times { errors << Factory(:err) }
	24	+ 3.times { errors << Factory(:err, :resolved => true)}
	25	+ Err.should_receive(:ordered).and_return(
	26	+ mock('proxy', :paginate => errors)
	27	+ )
	28	+ get :index
	29	+ assigns(:errs).should == errors
	30	+ end
	31	+ end
	32	+
20	33	describe "GET /projects/:project_id/errs/:id" do
21	34	before do
22	35	3.times { Factory(:notice, :err => err)}
...	...