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

Conflicts:
	app/controllers/request_controller.rb

1 files changed, 11 insertions, 2 deletions

diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
index 665ae8489..a0ea9bb48 100644
--- a/spec/controllers/request_controller_spec.rb
+++ b/spec/controllers/request_controller_spec.rb
@@ -353,14 +353,19 @@ describe RequestController, "when showing one request" do
             zipfile = Zip::ZipFile.open(File.join(File.dirname(__FILE__), "../../cache/zips", old_path)) { |zipfile|
                 zipfile.count.should == 3 # the message plus two "hello.txt" files
             }
+            
+            # The path of the zip file is based on the hash of the timestamp of the last request
+            # in the thread, so we wait for a second to make sure this one will have a different
+            # timestamp than the previous.
+            sleep 1
             receive_incoming_mail('incoming-request-attachment-unknown-extension.email', ir.incoming_email)
             get :download_entire_request, :url_title => title
             assigns[:url_path].should have_text(/#{title}.zip$/)
+            assigns[:url_path].should_not == old_path
             response.location.should have_text(/#{assigns[:url_path]}/)
             zipfile = Zip::ZipFile.open(File.join(File.dirname(__FILE__), "../../cache/zips", assigns[:url_path])) { |zipfile|
                 zipfile.count.should == 5 # the message, two hello.txt, the unknown attachment, and its empty message
             }
-            assigns[:url_path].should_not == old_path
         end
     end
 end
@@ -971,7 +976,11 @@ describe RequestController, "when classifying an information request" do
             session[:user_id] = @request_owner.id
             @dog_request = info_requests(:fancy_dog_request)
             InfoRequest.stub!(:find).and_return(@dog_request)
-            ActionController::Routing::Routes.filters.clear
+            @old_filters = ActionController::Routing::Routes.filters
+            ActionController::Routing::Routes.filters = RoutingFilter::Chain.new
+        end
+        after do
+            ActionController::Routing::Routes.filters = @old_filters
         end
 
         def request_url