diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-17 15:33:26 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-17 15:33:26 -0700 |
| commit | 6a6431abd38ae8b4b62caf457d0e991651826def (patch) | |
| tree | 5655e2b4170dd772c68eec30f03f4657b7c3a689 /spec/lib/mail_handler/mail_handler_spec.rb | |
| parent | b78b3610988735652e6eb17004dfa116b0fe2f15 (diff) | |
| parent | 4a4169c606e0e26b905e11e1fc75c45268498112 (diff) | |
Merge branch 'hotfix/0.11.0.13' into rails-3-develop
Conflicts:
spec/mailers/outgoing_mailer_spec.rb
Diffstat (limited to 'spec/lib/mail_handler/mail_handler_spec.rb')
| -rw-r--r-- | spec/lib/mail_handler/mail_handler_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/mail_handler/mail_handler_spec.rb b/spec/lib/mail_handler/mail_handler_spec.rb index 272b56d0b..d6e7ba5d2 100644 --- a/spec/lib/mail_handler/mail_handler_spec.rb +++ b/spec/lib/mail_handler/mail_handler_spec.rb @@ -223,7 +223,7 @@ describe 'when deriving a name, email and formatted address from a message from it 'should quote a name with quotes in it' do should_render_from_address('"FOI \" Person" <foiperson@localhost>', - ['FOI " Person', + ['FOI \" Person', 'foiperson@localhost', '"FOI \" Person" <foiperson@localhost>']) end |