Merge branch 'wdtk' of github.com:sebbacon/alaveteli into wdtk

1 files changed, 11 insertions, 1 deletions

diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
index 61f40ed13..6c6ccc76a 100644
--- a/spec/controllers/request_controller_spec.rb
+++ b/spec/controllers/request_controller_spec.rb
@@ -53,14 +53,24 @@ describe RequestController, "when listing recent requests" do
     it "should assign the first page of results" do
         xap_results = mock_model(ActsAsXapian::Search, 
                    :results => (1..25).to_a.map { |m| { :model => m } },
-                   :matches_estimated => 103)
+                   :matches_estimated => 1000000)
 
         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).
           and_return(xap_results)
         get :list, :view => 'all'
         assigns[:list_results].size.should == 25
+        assigns[:show_no_more_than].should == RequestController::MAX_RESULTS
     end
+    it "should return 404 for pages we don't want to serve up" do
+        xap_results = mock_model(ActsAsXapian::Search, 
+                   :results => (1..25).to_a.map { |m| { :model => m } },
+                   :matches_estimated => 1000000)
+        lambda {
+            get :list, :view => 'all', :page => 100
+        }.should raise_error(ActiveRecord::RecordNotFound)
+    end
+
 end
 
 describe RequestController, "when showing one request" do