Merge branch 'release/0.8' into wdtk

Conflicts:
    app/controllers/admin_request_controller.rb
    app/views/contact_mailer/from_admin_message.rhtml

1 files changed, 5 insertions, 4 deletions

diff --git a/spec/models/purge_request_spec.rb b/spec/models/purge_request_spec.rb
index 94fe01317..7b67fca52 100644
--- a/spec/models/purge_request_spec.rb
+++ b/spec/models/purge_request_spec.rb
@@ -1,12 +1,13 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'fakeweb'
 
-describe PurgeRequest, "purging things" do 
+describe PurgeRequest, "purging things" do
     before do
+        PurgeRequest.destroy_all
         FakeWeb.last_request = nil
     end
 
-    it 'should issue purge requests to the server' do 
+    it 'should issue purge requests to the server' do
         req = PurgeRequest.new(:url => "/begone_from_here",
                                :model => "don't care",
                                :model_id => "don't care")
@@ -16,7 +17,7 @@ describe PurgeRequest, "purging things" do
         PurgeRequest.all().count.should == 0
     end
 
-    it 'should fail silently for a misconfigured server' do 
+    it 'should fail silently for a misconfigured server' do
         FakeWeb.register_uri(:get, %r|brokenv|, :body => "BROKEN")
         config = MySociety::Config.load_default()
         config['VARNISH_HOST'] = "brokencache"
@@ -29,4 +30,4 @@ describe PurgeRequest, "purging things" do
         PurgeRequest.all().count.should == 0
     end
 end
- 
+