diff options
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/info_request_spec.rb | 10 | ||||
| -rw-r--r-- | spec/models/request_mailer_spec.rb | 4 | ||||
| -rw-r--r-- | spec/models/user_spec.rb | 20 |
3 files changed, 31 insertions, 3 deletions
diff --git a/spec/models/info_request_spec.rb b/spec/models/info_request_spec.rb index 7e87d0900..3147965c4 100644 --- a/spec/models/info_request_spec.rb +++ b/spec/models/info_request_spec.rb @@ -34,6 +34,14 @@ describe InfoRequest do @info_request.incoming_email.should_not be_nil end + it "should have a sensible incoming name and email" do + @info_request.incoming_name_and_email.should == "Bob Smith <" + @info_request.incoming_email + ">" + end + + it "should have a sensible recipient name and email" do + @info_request.recipient_name_and_email.should == "FOI requests at TGQ <geraldine-requests@localhost>" + end + it "should recognise its own incoming email" do incoming_email = @info_request.incoming_email found_info_request = InfoRequest.find_by_incoming_email(incoming_email) @@ -176,4 +184,4 @@ describe InfoRequest do end -end
\ No newline at end of file +end diff --git a/spec/models/request_mailer_spec.rb b/spec/models/request_mailer_spec.rb index 76eebd05f..7fa28cde4 100644 --- a/spec/models/request_mailer_spec.rb +++ b/spec/models/request_mailer_spec.rb @@ -119,14 +119,14 @@ describe RequestMailer, " when working out follow up addresses" do RequestMailer.email_for_followup(ir, im).should == "foiperson@localhost" end - it "should remove @ signs from name part in reply address as some mail servers hate it" do + it "should quote @ signs" do ir = info_requests(:fancy_dog_request) im = ir.incoming_messages[0] im.raw_email.data.sub!("FOI Person", "FOI @ Person") # check the basic entry in the fixture is fine - RequestMailer.name_and_email_for_followup(ir, im).should == "FOI Person <foiperson@localhost>" + RequestMailer.name_and_email_for_followup(ir, im).should == "\"FOI @ Person\" <foiperson@localhost>" RequestMailer.name_for_followup(ir, im).should == "FOI @ Person" RequestMailer.email_for_followup(ir, im).should == "foiperson@localhost" end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index dc14feff9..46aa046fb 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -124,3 +124,23 @@ describe User, 'when asked if a user owns every request' do end end + +describe User, " when making name and email address" do + it "should generate a name and email" do + @user = User.new + @user.name = "Sensible User" + @user.email = "sensible@localhost" + + @user.name_and_email.should == "Sensible User <sensible@localhost>" + end + + it "should quote name and email with funny characters in the name" do + @user = User.new + @user.name = "Silly @ User" + @user.email = "silly@localhost" + + @user.name_and_email.should == "\"Silly @ User\" <silly@localhost>" + end +end + + |