Fix bug introduced in cec2c545e0a10e0641c4ee67839c88d872b394b8, related to issue #343.

1 files changed, 11 insertions, 11 deletions

diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
index 52fea03b5..40cb168f4 100644
--- a/spec/controllers/request_controller_spec.rb
+++ b/spec/controllers/request_controller_spec.rb
@@ -23,9 +23,9 @@ describe RequestController, "when listing recent requests" do
 
     it "should filter requests" do
         get :list, :view => 'all'
-        assigns[:list_results].size.should == 2
+        assigns[:list_results].size.should == 3
         # default sort order is the request with the most recently created event first
-        assigns[:list_results][0].info_request.id.should == 101
+        assigns[:list_results][0].info_request.id.should == 104
         get :list, :view => 'successful'
         assigns[:list_results].size.should == 0
     end
@@ -34,9 +34,9 @@ describe RequestController, "when listing recent requests" do
         get :list, :view => 'all', :request_date_before => '13/10/2007'
         assigns[:list_results].size.should == 1
         get :list, :view => 'all', :request_date_after => '13/10/2007'
-        assigns[:list_results].size.should == 2
+        assigns[:list_results].size.should == 3
         get :list, :view => 'all', :request_date_after => '13/10/2007', :request_date_before => '01/11/2007'
-        assigns[:list_results].size.should == 2
+        assigns[:list_results].size.should == 1
     end
 
     it "should list internal_review requests as unresolved ones" do
@@ -56,7 +56,7 @@ describe RequestController, "when listing recent requests" do
                    :matches_estimated => 103)
 
         InfoRequest.should_receive(:full_search).
-          with([InfoRequestEvent]," variety:sent OR variety:followup_sent OR variety:response OR variety:comment", "created_at", anything, anything, anything, anything).
+          with([InfoRequestEvent]," (variety:sent OR variety:followup_sent OR variety:response OR variety:comment)", "created_at", anything, anything, anything, anything).
           and_return(xap_results)
         get :list, :view => 'recent'
         assigns[:list_results].size.should == 25
@@ -1124,8 +1124,8 @@ describe RequestController, "sending overdue request alerts" do
         RequestMailer.alert_overdue_requests
 
         deliveries = ActionMailer::Base.deliveries
-        deliveries.size.should == 1
-        mail = deliveries[0]
+        deliveries.size.should == 2
+        mail = deliveries[1]
         mail.body.should =~ /promptly, as normally/
         mail.to_addrs.first.to_s.should == info_requests(:naughty_chicken_request).user.name_and_email
 
@@ -1152,8 +1152,8 @@ describe RequestController, "sending overdue request alerts" do
         RequestMailer.alert_overdue_requests
 
         deliveries = ActionMailer::Base.deliveries
-        deliveries.size.should == 1
-        mail = deliveries[0]
+        deliveries.size.should == 2
+        mail = deliveries[1]
         mail.body.should =~ /promptly, as normally/
         mail.to_addrs.first.to_s.should == info_requests(:naughty_chicken_request).user.name_and_email
     end
@@ -1177,8 +1177,8 @@ describe RequestController, "sending overdue request alerts" do
         RequestMailer.alert_overdue_requests
 
         deliveries = ActionMailer::Base.deliveries
-        deliveries.size.should == 1
-        mail = deliveries[0]
+        deliveries.size.should == 2
+        mail = deliveries[1]
         mail.body.should =~ /required by law/
         mail.to_addrs.first.to_s.should == info_requests(:naughty_chicken_request).user.name_and_email