3 files changed, 45 insertions, 1 deletions
diff --git a/spec/models/info_request_batch_spec.rb b/spec/models/info_request_batch_spec.rb
index 2881e7745..701422037 100644
--- a/spec/models/info_request_batch_spec.rb
+++ b/spec/models/info_request_batch_spec.rb
@@ -80,7 +80,7 @@ describe InfoRequestBatch, "when finding an existing batch" do
     end
 end
 
-describe InfoRequestBatch, "when creating a batch", :focus => true do
+describe InfoRequestBatch, "when creating a batch" do
 
     before do
         @title = 'A test title'
diff --git a/spec/models/info_request_spec.rb b/spec/models/info_request_spec.rb
index 70947584b..d8c0c59b1 100644
--- a/spec/models/info_request_spec.rb
+++ b/spec/models/info_request_spec.rb
@@ -1221,6 +1221,7 @@ describe InfoRequest do
     describe InfoRequest, "when constructing a list of requests by query" do
 
         before(:each) do
+            load_raw_emails_data
             get_fixtures_xapian_index
         end
 
@@ -1313,4 +1314,20 @@ describe InfoRequest do
 
 
     end
+
+    describe 'when destroying a message' do
+
+        it 'can destroy a request with comments and censor rules' do
+            info_request = FactoryGirl.create(:info_request)
+            censor_rule = FactoryGirl.create(:censor_rule, :info_request => info_request)
+            comment = FactoryGirl.create(:comment, :info_request => info_request)
+            info_request.reload
+            info_request.fully_destroy
+
+            InfoRequest.where(:id => info_request.id).should be_empty
+            CensorRule.where(:id => censor_rule.id).should be_empty
+            Comment.where(:id => comment.id).should be_empty
+        end
+
+    end
 end
diff --git a/spec/models/public_body_spec.rb b/spec/models/public_body_spec.rb
index 7b55efda1..cce017424 100644
--- a/spec/models/public_body_spec.rb
+++ b/spec/models/public_body_spec.rb
@@ -1237,6 +1237,33 @@ describe PublicBody do
 
     end
 
+    describe :request_email do
+        context "when the email is set" do
+            subject(:public_body) { FactoryGirl.create(:public_body, :request_email => "request@example.com") }
+
+            it "should return the set email address" do
+                expect(public_body.request_email).to eq("request@example.com")
+            end
+
+            it "should return a different email address when overridden in configuration" do
+                AlaveteliConfiguration.stub!(:override_all_public_body_request_emails).and_return("tester@example.com")
+                expect(public_body.request_email).to eq("tester@example.com")
+            end
+        end
+
+        context "when no email is set" do
+            subject(:public_body) { FactoryGirl.create(:public_body, :request_email => "") }
+
+            it "should return a blank email address" do
+                expect(public_body.request_email).to be_blank
+            end
+
+            it "should still return a blank email address when overridden in configuration" do
+                AlaveteliConfiguration.stub!(:override_all_public_body_request_emails).and_return("tester@example.com")
+                expect(public_body.request_email).to be_blank
+            end
+        end
+    end
 end
 
 describe PublicBody::Translation do