5 files changed, 38 insertions, 1 deletions

diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb
index 76e1bb5e6..3640a8148 100644
--- a/spec/controllers/general_controller_spec.rb
+++ b/spec/controllers/general_controller_spec.rb
@@ -62,7 +62,6 @@ describe GeneralController, "when searching" do
         response.should be_success
     end
 
-
     it "should redirect from search query URL to pretty URL" do
         post :search_redirect, :query => "mouse" # query hidden in POST parameters
         response.should redirect_to(:action => 'search', :combined => "mouse") # URL /search/:query
diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
index dcd33d279..a9315ddb2 100644
--- a/spec/controllers/request_controller_spec.rb
+++ b/spec/controllers/request_controller_spec.rb
@@ -308,6 +308,13 @@ describe RequestController, "when creating a new request" do
         response.should redirect_to(:controller => 'general', :action => 'frontpage')
     end
 
+    it "should redirect 'bad request' page when a body has no email address" do
+        @body.request_email = ""
+        @body.save!
+        get :new, :public_body_id => @body.id
+        response.should render_template('new_bad_contact')
+    end
+
     it "should accept a public body parameter" do
         get :new, :public_body_id => @body.id
         assigns[:info_request].public_body.should == @body    
diff --git a/spec/integration/search_request_spec.rb b/spec/integration/search_request_spec.rb
new file mode 100644
index 000000000..9398519b7
--- /dev/null
+++ b/spec/integration/search_request_spec.rb
@@ -0,0 +1,9 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "When searching" do
+    it "should not strip quotes from quoted query" do
+        request_via_redirect("post", "/search", :query => '"mouse stilton"')
+        response.body.should include(""mouse stilton"")
+    end
+end
+
diff --git a/spec/lib/i18n_interpolation.rb b/spec/lib/i18n_interpolation.rb
new file mode 100644
index 000000000..8c86413ad
--- /dev/null
+++ b/spec/lib/i18n_interpolation.rb
@@ -0,0 +1,15 @@
+# This is a test of the set_content_type monkey patch in
+# lib/tmail_extensions.rb
+
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "when using i18n" do
+
+    it "should not complain if we're missing variables from the string" do
+        result = _('Hello', :dip => 'hummus')
+        result.should == 'Hello'
+        result = _('Hello {{dip}}', :dip => 'hummus')
+        result.should == 'Hello hummus'
+    end
+end
+
diff --git a/spec/models/outgoing_message_spec.rb b/spec/models/outgoing_message_spec.rb
index a9ef57b4f..1956c4d73 100644
--- a/spec/models/outgoing_message_spec.rb
+++ b/spec/models/outgoing_message_spec.rb
@@ -1,7 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe OutgoingMessage, " when making an outgoing message" do
+    fixtures :outgoing_messages, :info_requests, :incoming_messages, :public_bodies, :public_body_translations
+
     before do
+        @om = outgoing_messages(:useless_outgoing_message)
         @outgoing_message = OutgoingMessage.new({
             :status => 'ready',
             :message_type => 'initial_request',
@@ -27,6 +30,10 @@ describe OutgoingMessage, " when making an outgoing message" do
     it "should include email addresses in outgoing messages" do
         @outgoing_message.body.should include("foo@bar.com")
     end
+
+    it "should work out a salutation" do
+        @om.get_salutation.should == "Dear Geraldine Quango,"
+    end
 end