Merge branch 'develop' of git@github.com:sebbacon/alaveteli into develop

Conflicts:
	app/models/request_mailer.rb

1 files changed, 53 insertions, 0 deletions

diff --git a/spec/integration/search_request_spec.rb b/spec/integration/search_request_spec.rb
index 9398519b7..25c091111 100644
--- a/spec/integration/search_request_spec.rb
+++ b/spec/integration/search_request_spec.rb
@@ -1,9 +1,62 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "When searching" do
+
+    fixtures [ :info_requests,
+               :info_request_events,
+               :public_bodies,
+               :public_body_translations,
+               :users,
+               :raw_emails,
+               :outgoing_messages,
+               :incoming_messages,
+               :comments ]
+
+    before(:each) do
+        load_raw_emails_data(raw_emails)
+    end
+
     it "should not strip quotes from quoted query" do
         request_via_redirect("post", "/search", :query => '"mouse stilton"')
         response.body.should include(""mouse stilton"")
     end
+
+    it "should correctly execute simple search" do
+        request_via_redirect("post", "/search",
+                             :query => 'bob'
+                             )
+        response.body.should include("FOI requests")
+    end
+
+    it "should correctly filter searches for requests" do
+        request_via_redirect("post", "/search/bob/requests")   
+        response.body.should_not include("One person found")
+        response.body.should include("FOI requests 1 to 2 of 2")
+    end
+    it "should correctly filter searches for users" do
+        request_via_redirect("post", "/search/bob/users")   
+        response.body.should include("One person found")
+        response.body.should_not include("FOI requests 1 to 2 of 2")
+    end
+
+    it "should correctly filter searches for successful requests" do
+        request_via_redirect("post", "/search",
+                             :query => "bob",
+                             :latest_status => ['successful'])
+        response.body.should include("no requests matching your query")
+    end
+
+    it "should correctly filter searches for comments" do
+        request_via_redirect("post", "/search",
+                             :query => "daftest",
+                             :request_variety => ['comments'])
+        response.body.should include("One FOI request found")
+
+        request_via_redirect("post", "/search",
+                             :query => "daftest",
+                             :request_variety => ['response','sent'])
+        response.body.should include("no requests matching your query")
+    end
+
 end