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

Conflicts:
	app/controllers/request_controller.rb

1 files changed, 6 insertions, 1 deletions

diff --git a/spec/helpers/link_to_helper_spec.rb b/spec/helpers/link_to_helper_spec.rb
index f85d2e70d..3fa91a8f8 100644
--- a/spec/helpers/link_to_helper_spec.rb
+++ b/spec/helpers/link_to_helper_spec.rb
@@ -7,9 +7,14 @@ describe LinkToHelper do
     describe 'when creating a url for a request' do 
         
         before do
-            ActionController::Routing::Routes.filters.clear
             @mock_request = mock_model(InfoRequest, :url_title => 'test_title')
+            @old_filters = ActionController::Routing::Routes.filters
+            ActionController::Routing::Routes.filters = RoutingFilter::Chain.new
         end
+        after do
+            ActionController::Routing::Routes.filters = @old_filters
+        end
+
         
         it 'should return a path like /request/test_title' do 
             request_url(@mock_request).should == '/request/test_title'