Attempt to merge current develop to theme

2 files changed, 5 insertions, 6 deletions

diff --git a/spec/views/public_body/show.rhtml_spec.rb b/spec/views/public_body/show.rhtml_spec.rb
index d52e1ac5e..797923c5d 100644
--- a/spec/views/public_body/show.rhtml_spec.rb
+++ b/spec/views/public_body/show.rhtml_spec.rb
@@ -1,7 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe "when viewing a body" do
-
     before do
         @pb = mock_model(PublicBody, 
                          :name => 'Test Quango', 
@@ -28,6 +27,8 @@ describe "when viewing a body" do
         assigns[:xapian_requests] = @xap
         assigns[:page] = 1
         assigns[:per_page] = 10
+        # work round a bug in ActionController::TestRequest; allows request.query_string to work in the template
+        request.env["REQUEST_URI"] = ""
     end
 
     it "should be successful" do
@@ -51,7 +52,7 @@ describe "when viewing a body" do
     end
 
     it "should cope with no results" do
-        @xap.stub!(:results).and_return([])
+        @pb.stub!(:info_requests).and_return([])
         render "public_body/show"
         response.should have_tag("p", /Nobody has made any Freedom of Information requests/m)
     end
diff --git a/spec/views/request/list.rhtml_spec.rb b/spec/views/request/list.rhtml_spec.rb
index 578bd5cc8..60a28eec5 100644
--- a/spec/views/request/list.rhtml_spec.rb
+++ b/spec/views/request/list.rhtml_spec.rb
@@ -5,7 +5,8 @@ describe "when listing recent requests" do
     before do
         assigns[:page] = 1
         assigns[:per_page] = 10
-
+        # work round a bug in ActionController::TestRequest; allows request.query_string to work in the template
+        request.env["REQUEST_URI"] = ""
         # we're not testing the interlock plugin's cache
         template.stub!(:view_cache).and_yield
     end
@@ -32,9 +33,7 @@ describe "when listing recent requests" do
     it "should be successful" do
         assigns[:list_results] = [ make_mock_event, make_mock_event ]
         assigns[:matches_estimated] = 2
-
         render "request/list"
-
         response.should have_tag("div.request_listing")
         response.should_not have_tag("p", /No requests of this sort yet/m)
     end
@@ -42,7 +41,6 @@ describe "when listing recent requests" do
     it "should cope with no results" do
         assigns[:list_results] = [ ]
         assigns[:matches_estimated] = 0
-
         render "request/list"
         response.should have_tag("p", /No requests of this sort yet/m)
         response.should_not have_tag("div.request_listing")