Merge pull request #747 from robinboening/feature/date_filter

Render partial for problems/search form and add specs

Merge pull request #747 from robinboening/feature/date_filter
Render partial for problems/search form and add specs
Stephen Crosby
2 parents f7792c26 9c94b7db
Showing 5 changed files with 31 additions and 5 deletions Show diff stats
app/views/apps/show.html.haml
app/views/problems/_search.html.haml
app/views/problems/index.html.haml
config/locales/en.yml
spec/controllers/problems_controller_spec.rb
@@ -88,8 +88,7 @@
 - if app.problems.any?
   %h3.clear=t('.errors')
   %section
-    = form_tag search_problems_path(:all_errs => all_errs, :app_id => app.id), :method => :get, :remote => true do
-      = text_field_tag :search, params[:search], :placeholder => t('.search_placeholder')
+    = render 'problems/search', :all_errs => @all_errs, :app_id => app.id
   %br
   %section
     .problem_table{:id => 'problem_table'}
@@ -0,0 +1,2 @@
+= form_tag search_problems_path(:all_errs => all_errs, :app_id => app_id), :method => :get, :remote => true do
+    = text_field_tag :search, params[:search], :placeholder => t('.search_placeholder')
@@ -9,8 +9,7 @@
     = link_to 'show resolved', problems_path(:all_errs => true), :class => 'button'
 %section
-  = form_tag search_problems_path(:all_errs => @all_errs), :method => :get, :remote => true do
-    = text_field_tag :search, params[:search], :placeholder => 'Search for issues'
+  = render 'problems/search', :all_errs => @all_errs, :app_id => nil
 %br
 %section
   #problem_table.problem_table
@@ -77,6 +77,8 @@ en:
       merge: "Merge select issues? They can be unmerged later."
       unmerge: "Unmerge selected issues? They can be re-merged later."
       unresolve: "Unresolve selected issues? They can be resolved again later."
+    search:
+      search_placeholder: 'Search for issues'
   comments:
     confirm_delete: "Permanently delete this comment?"
@@ -118,7 +120,6 @@ en:
       no_watcher: "Sadly, no one is watching this app"
       repository: Repository
       revision: Revision
-      search_placeholder: 'Search for issues'
       show_hide: "(show/hide)"
       unresolved_errs: unresolved errs
       unwatch: unwatch
@@ -123,6 +123,31 @@ describe ProblemsController do
     end
   end
+  describe "GET /problems/search" do
+    before do
+      sign_in Fabricate(:admin)
+      @app      = Fabricate(:app)
+      @problem1 = Fabricate(:problem, :app=>@app, message: "Most important")
+      @problem2 = Fabricate(:problem, :app=>@app, message: "Very very important")
+    end
+
+    it "renders successfully" do
+      get :search
+      expect(response).to be_success
+    end
+
+    it "renders index template" do
+      get :search
+      expect(response).to render_template('problems/index')
+    end
+
+    it "searches problems for given string" do
+      get :search, :search => "Most important"
+      expect(controller.problems).to include(@problem1)
+      expect(controller.problems).to_not include(@problem2)
+    end
+  end
+
   describe "GET /apps/:app_id/problems/:id" do
     #render_views
@@ -0,0 +1,2 @@		@@ -0,0 +1,2 @@
	1	+= form_tag search_problems_path(:all_errs => all_errs, :app_id => app_id), :method => :get, :remote => true do
	2	+ = text_field_tag :search, params[:search], :placeholder => t('.search_placeholder')
	@@ -77,6 +77,8 @@ en:		@@ -77,6 +77,8 @@ en:
77	merge: "Merge select issues? They can be unmerged later."	77	merge: "Merge select issues? They can be unmerged later."
78	unmerge: "Unmerge selected issues? They can be re-merged later."	78	unmerge: "Unmerge selected issues? They can be re-merged later."
79	unresolve: "Unresolve selected issues? They can be resolved again later."	79	unresolve: "Unresolve selected issues? They can be resolved again later."
		80	+ search:
		81	+ search_placeholder: 'Search for issues'
80		82
81	comments:	83	comments:
82	confirm_delete: "Permanently delete this comment?"	84	confirm_delete: "Permanently delete this comment?"
	@@ -118,7 +120,6 @@ en:		@@ -118,7 +120,6 @@ en:
118	no_watcher: "Sadly, no one is watching this app"	120	no_watcher: "Sadly, no one is watching this app"
119	repository: Repository	121	repository: Repository
120	revision: Revision	122	revision: Revision
121	- search_placeholder: 'Search for issues'
122	show_hide: "(show/hide)"	123	show_hide: "(show/hide)"
123	unresolved_errs: unresolved errs	124	unresolved_errs: unresolved errs
124	unwatch: unwatch	125	unwatch: unwatch
	@@ -123,6 +123,31 @@ describe ProblemsController do		@@ -123,6 +123,31 @@ describe ProblemsController do
123	end	123	end
124	end	124	end
125		125
		126	+ describe "GET /problems/search" do
		127	+ before do
		128	+ sign_in Fabricate(:admin)
		129	+ @app = Fabricate(:app)
		130	+ @problem1 = Fabricate(:problem, :app=>@app, message: "Most important")
		131	+ @problem2 = Fabricate(:problem, :app=>@app, message: "Very very important")
		132	+ end
		133	+
		134	+ it "renders successfully" do
		135	+ get :search
		136	+ expect(response).to be_success
		137	+ end
		138	+
		139	+ it "renders index template" do
		140	+ get :search
		141	+ expect(response).to render_template('problems/index')
		142	+ end
		143	+
		144	+ it "searches problems for given string" do
		145	+ get :search, :search => "Most important"
		146	+ expect(controller.problems).to include(@problem1)
		147	+ expect(controller.problems).to_not include(@problem2)
		148	+ end
		149	+ end
		150	+
126	describe "GET /apps/:app_id/problems/:id" do	151	describe "GET /apps/:app_id/problems/:id" do
127	#render_views	152	#render_views
128		153