From 5c2a498716fcaaf37bc892103225b72f611d25e8 Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Wed, 19 Mar 2014 22:06:01 +0000 Subject: [PATCH] noreply-email: fix tests related to noreply changes --- test/unit/contact_sender_test.rb | 2 +- test/unit/contact_test.rb | 3 +++ test/unit/task_mailer_test.rb | 12 ++++++------ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/test/unit/contact_sender_test.rb b/test/unit/contact_sender_test.rb index 29ce03b..b4ffb03 100644 --- a/test/unit/contact_sender_test.rb +++ b/test/unit/contact_sender_test.rb @@ -16,7 +16,7 @@ class ContactSenderTest < ActiveSupport::TestCase ent.contact_email = 'contact@invalid.com' c = build(Contact, :dest => ent) response = Contact::Sender.deliver_mail(c) - assert_equal Environment.default.noreply_email, response.from.to_s + assert_equal Environment.default.noreply_email.to_s, response.from.to_s assert_equal "[#{ent.name}] #{c.subject}", response.subject end diff --git a/test/unit/contact_test.rb b/test/unit/contact_test.rb index aaf8d44..77df75a 100644 --- a/test/unit/contact_test.rb +++ b/test/unit/contact_test.rb @@ -46,6 +46,9 @@ class ContactTest < ActiveSupport::TestCase should 'use sender name and environment noreply_email on from' do ent = fast_create(Enterprise, :name => 'my enterprise', :identifier => 'myent') + env = ent.environment + env.noreply_email = 'noreply@sample.org' + env.save! c = Contact.new(:name => 'john', :email => 'john@invalid.com', :subject => 'hi', :message => 'hi, all', :dest => ent) email = c.deliver assert_equal "#{c.name} <#{ent.environment.noreply_email}>", email['from'].to_s diff --git a/test/unit/task_mailer_test.rb b/test/unit/task_mailer_test.rb index a7f2a3a..28bfbcc 100644 --- a/test/unit/task_mailer_test.rb +++ b/test/unit/task_mailer_test.rb @@ -24,7 +24,7 @@ class TaskMailerTest < ActiveSupport::TestCase requestor.expects(:name).returns('my name') environment = mock() - environment.expects(:contact_email).returns('sender@example.com') + environment.expects(:noreply_email).returns('sender@example.com') environment.expects(:default_hostname).returns('example.com') environment.expects(:name).returns('example').at_least_once @@ -47,7 +47,7 @@ class TaskMailerTest < ActiveSupport::TestCase requestor.expects(:name).returns('my name') environment = mock() - environment.expects(:contact_email).returns('sender@example.com') + environment.expects(:noreply_email).returns('sender@example.com') environment.expects(:default_hostname).returns('example.com') environment.expects(:name).returns('example').at_least_once @@ -71,7 +71,7 @@ class TaskMailerTest < ActiveSupport::TestCase requestor.expects(:name).returns('my name') environment = mock() - environment.expects(:contact_email).returns('sender@example.com') + environment.expects(:noreply_email).returns('sender@example.com') environment.expects(:default_hostname).returns('example.com') environment.expects(:name).returns('example').at_least_once @@ -105,7 +105,7 @@ class TaskMailerTest < ActiveSupport::TestCase requestor.stubs(:public_profile_url).returns('requestor_path') environment = mock() - environment.expects(:contact_email).returns('sender@example.com') + environment.expects(:noreply_email).returns('sender@example.com') environment.expects(:default_hostname).returns('example.com') environment.expects(:name).returns('example').at_least_once @@ -124,11 +124,11 @@ class TaskMailerTest < ActiveSupport::TestCase assert !ActionMailer::Base.deliveries.empty? end - should 'use environment name and contact email' do + should 'use environment name and no-reply email' do task = mock environment = mock environment.expects(:name).returns('My name') - environment.expects(:contact_email).returns('email@example.com') + environment.expects(:noreply_email).returns('email@example.com') task.expects(:environment).returns(environment).at_least_once -- libgit2 0.21.2