From 0ceb4036c5fa8c32f4b36b2486827401ddcc3156 Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Fri, 13 Sep 2013 21:03:49 +0000 Subject: [PATCH] rails3: fix mailer deliver --- test/unit/create_community_test.rb | 2 +- test/unit/invite_member_test.rb | 10 +++++----- test/unit/suggest_article_test.rb | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/unit/create_community_test.rb b/test/unit/create_community_test.rb index ba63a1f..bccc6b5 100644 --- a/test/unit/create_community_test.rb +++ b/test/unit/create_community_test.rb @@ -98,7 +98,7 @@ class CreateCommunityTest < ActiveSupport::TestCase should 'deliver target notification message' do task = CreateCommunity.new(:name => 'community test', :target => Environment.default, :requestor => person) - email = TaskMailer.deliver_target_notification(task, task.target_notification_message) + email = TaskMailer.target_notification(task, task.target_notification_message).deliver assert_match(/#{task.requestor.name} wants to create community #{task.subject}/, email.subject) end diff --git a/test/unit/invite_member_test.rb b/test/unit/invite_member_test.rb index 01c664d..7ed549a 100644 --- a/test/unit/invite_member_test.rb +++ b/test/unit/invite_member_test.rb @@ -88,10 +88,10 @@ class InviteMemberTest < ActiveSupport::TestCase should 'not invite yourself' do p = create_user('testuser1').person - task1 = InviteMember.new(:person => p, :friend => p, :message => 'click here: ') + task1 = build(InviteMember, :person => p, :friend => p, :message => 'click here: ') assert !task1.save - task2 = InviteMember.new(:person => p, :friend_name => 'Myself', :friend_email => p.user.email, :message => 'click here: ') + task2 = build(InviteMember, :person => p, :friend_name => 'Myself', :friend_email => p.user.email, :message => 'click here: ') assert !task2.save end @@ -99,7 +99,7 @@ class InviteMemberTest < ActiveSupport::TestCase p = create_user('testuser1').person community = fast_create(Community) - task = InviteMember.create!(:person => p, :friend_email => 'test@test.com', :message => '', :community_id => community.id) + task = create(InviteMember, :person => p, :friend_email => 'test@test.com', :message => '', :community_id => community.id) assert_match(/#{task.requestor.name} invited you to join #{community.name}/, task.target_notification_description) end @@ -108,9 +108,9 @@ class InviteMemberTest < ActiveSupport::TestCase person = create_user('testuser1').person community = fast_create(Community) - task = InviteMember.create!(:person => person, :friend_email => 'test@test.com', :message => '', :community_id => community.id) + task = create(InviteMember, :person => person, :friend_email => 'test@test.com', :message => '', :community_id => community.id) - email = TaskMailer.deliver_invitation_notification(task) + email = TaskMailer.invitation_notification(task).deliver assert_match(/#{task.requestor.name} invited you to join #{community.name}/, email.subject) end diff --git a/test/unit/suggest_article_test.rb b/test/unit/suggest_article_test.rb index ed67301..6876a18 100644 --- a/test/unit/suggest_article_test.rb +++ b/test/unit/suggest_article_test.rb @@ -145,7 +145,7 @@ class SuggestArticleTest < ActiveSupport::TestCase should 'deliver target notification message' do task = build(SuggestArticle, :target => @profile, :article_name => 'suggested article', :name => 'johndoe', :email => 'johndoe@example.com') - email = TaskMailer.deliver_target_notification(task, task.target_notification_message) + email = TaskMailer.target_notification(task, task.target_notification_message).deliver assert_match(/#{task.name}.*suggested the publication of the article: #{task.subject}/, email.subject) end -- libgit2 0.21.2