diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-11-29 15:06:07 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-11-29 15:06:07 +0000 |
| commit | eb1432f9992275df485f8502ad3ab6f7c8d494b7 (patch) | |
| tree | ec20310d47c7f4e4cd136ac1671b32db4a379ea7 /spec/lib/mail_handler | |
| parent | 5ddd0620f8023c4bbf7d82e61f841dadd73bb7ba (diff) | |
| parent | 20089cf7b5045d504b7240bc92e2b6068fcc2246 (diff) | |
Merge remote-tracking branch 'origin/merged-rails-3-2-assset-pipeline' into rails-3-develop
Conflicts:
Gemfile.lock
Diffstat (limited to 'spec/lib/mail_handler')
| -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 aa351bd94..bc027eaec 100644 --- a/spec/lib/mail_handler/mail_handler_spec.rb +++ b/spec/lib/mail_handler/mail_handler_spec.rb @@ -235,7 +235,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 |