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

Conflicts:
	app/controllers/request_controller.rb

1 files changed, 5 insertions, 1 deletions

diff --git a/spec/controllers/public_body_controller_spec.rb b/spec/controllers/public_body_controller_spec.rb
index 72fbe965c..131412a90 100644
--- a/spec/controllers/public_body_controller_spec.rb
+++ b/spec/controllers/public_body_controller_spec.rb
@@ -50,9 +50,13 @@ describe PublicBodyController, "when showing a body" do
     end
 
     it "should redirect use to the relevant locale even when url_name is for a different locale" do
-        ActionController::Routing::Routes.filters.clear
+        old_filters = ActionController::Routing::Routes.filters
+        ActionController::Routing::Routes.filters = RoutingFilter::Chain.new
+
         get :show, {:url_name => "edfh", :view => 'all'}
         response.should redirect_to "http://test.host/body/dfh"
+
+        ActionController::Routing::Routes.filters = old_filters
     end
  
     it "should redirect to newest name if you use historic name of public body in URL" do