diff options
author | Louise Crow <louise.crow@gmail.com> | 2013-01-15 16:05:25 +0000 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2013-01-15 16:05:25 +0000 |
commit | d1cac849b5c74e4f0d35b193ad24eed1d6b66af6 (patch) | |
tree | cb153b82b3e1d451be2d299b6114c99b6610b173 /spec/models/track_mailer_spec.rb | |
parent | f25df72186683e54dd10fd5aa94e1e26dff8ea92 (diff) | |
parent | 7cc8cae3a669fc5de91d6bc23812c265e8af4c93 (diff) |
Merge branch 'release/0.6.9'
Diffstat (limited to 'spec/models/track_mailer_spec.rb')
-rw-r--r-- | spec/models/track_mailer_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/track_mailer_spec.rb b/spec/models/track_mailer_spec.rb index 1bf77dab5..9bf03c3d0 100644 --- a/spec/models/track_mailer_spec.rb +++ b/spec/models/track_mailer_spec.rb @@ -169,7 +169,7 @@ describe TrackMailer do it 'should deliver one email, with right headers' do @user = mock_model(User, - :name_and_email => TMail::Address.address_from_name_and_email('Tippy Test', 'tippy@localhost'), + :name_and_email => MailHandler.address_from_name_and_email('Tippy Test', 'tippy@localhost'), :url_name => 'tippy_test' ) |