Merge branch 'release/0.6.7'

Conflicts:
  locale/cs/app.po
  locale/ro_RO/app.po

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/models/public_body_spec.rb b/spec/models/public_body_spec.rb
index 011824190..c2e0a6353 100644
--- a/spec/models/public_body_spec.rb
+++ b/spec/models/public_body_spec.rb
@@ -453,3 +453,11 @@ describe PublicBody do
     end
 
 end
+
+describe PublicBody, " when override all public body request emails set" do
+    it "should return the overridden request email" do
+        MySociety::Config.should_receive(:get).with("OVERRIDE_ALL_PUBLIC_BODY_REQUEST_EMAILS", "").twice.and_return("catch_all_test_email@foo.com")
+        @geraldine = public_bodies(:geraldine_public_body)
+        @geraldine.request_email.should == "catch_all_test_email@foo.com"
+    end
+end