Clear purge requests in the setup of tests that count them.

2 files changed, 12 insertions, 7 deletions

diff --git a/spec/controllers/admin_censor_rule_controller_spec.rb b/spec/controllers/admin_censor_rule_controller_spec.rb
index 8893a858b..fb9ddf594 100644
--- a/spec/controllers/admin_censor_rule_controller_spec.rb
+++ b/spec/controllers/admin_censor_rule_controller_spec.rb
@@ -2,10 +2,14 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe AdminCensorRuleController, "when making censor rules from the admin interface" do
     integrate_views
-    before { basic_auth_login @request }
-  
+    before do
+        basic_auth_login @request
+        PurgeRequest.destroy_all
+    end
+
+
     it "should create a censor rule and purge the corresponding request from varnish" do
-        ir = info_requests(:fancy_dog_request) 
+        ir = info_requests(:fancy_dog_request)
         post :create, :censor_rule => {
                          :text => "meat",
                          :replacement => "tofu",
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
- 
+