aboutsummaryrefslogtreecommitdiffstats
path: root/spec/models/track_mailer_spec.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2012-11-20 16:14:22 +0000
committerLouise Crow <louise.crow@gmail.com>2012-11-20 16:14:22 +0000
commitfcb6cdd6342d0272a8e7f05d20a4b0d87da70de9 (patch)
tree48ea4a5a796c4e95d26e4d4f36170ac09d368637 /spec/models/track_mailer_spec.rb
parentb0d9551a83c4a101ac808f1c35f66dd138cbc0f1 (diff)
parent24c3ceb2315734ab6e43ae4f75673e251b98a96e (diff)
Merge remote-tracking branch 'origin/feature/isolate-mail-handling' into develop
Diffstat (limited to 'spec/models/track_mailer_spec.rb')
-rw-r--r--spec/models/track_mailer_spec.rb2
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'
)