From 0b4205cedfe41e6ae9058a4601c5a7d6c4bd00c7 Mon Sep 17 00:00:00 2001 From: Leandro Nunes dos Santos Date: Fri, 2 Aug 2013 12:32:38 -0300 Subject: [PATCH] Rails3: Fix ContactSender unit tests partially --- test/unit/contact_sender_test.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/unit/contact_sender_test.rb b/test/unit/contact_sender_test.rb index d4c65f9..5962eee 100644 --- a/test/unit/contact_sender_test.rb +++ b/test/unit/contact_sender_test.rb @@ -12,7 +12,7 @@ class ContactSenderTest < ActiveSupport::TestCase end should 'be able to deliver mail' do - ent = Enterprise.new(:name => 'my enterprise', :identifier => 'myent', :environment => Environment.default) + ent = Environment.default.enterprises.new(:name => 'my enterprise', :identifier => 'myent') ent.contact_email = 'contact@invalid.com' c = build(Contact, :dest => ent) response = Contact::Sender.deliver_mail(c) @@ -21,7 +21,7 @@ class ContactSenderTest < ActiveSupport::TestCase end should 'deliver mail to contact_email' do - ent = Enterprise.new(:name => 'my enterprise', :identifier => 'myent', :environment => Environment.default) + ent = Environment.default.enterprises.new(:name => 'my enterprise', :identifier => 'myent') ent.contact_email = 'contact@invalid.com' c = build(Contact, :dest => ent) response = Contact::Sender.deliver_mail(c) @@ -30,7 +30,7 @@ class ContactSenderTest < ActiveSupport::TestCase should 'deliver mail to admins of enterprise' do admin = create_user('admin_test').person - ent = Enterprise.create!(:name => 'my enterprise', :identifier => 'myent', :environment => Environment.default) + ent = Environment.default.enterprises.create!(:name => 'my enterprise', :identifier => 'myent') ent.contact_email = 'contact@invalid.com' ent.add_admin(admin) assert ent.save! @@ -40,14 +40,14 @@ class ContactSenderTest < ActiveSupport::TestCase end should 'deliver a copy of email if requester wants' do - ent = Enterprise.new(:name => 'my enterprise', :identifier => 'myent', :environment => Environment.default) + ent = Environment.default.enterprises.new(:name => 'my enterprise', :identifier => 'myent') c = build(Contact, :dest => ent, :email => 'requester@invalid.com', :receive_a_copy => true) response = Contact::Sender.deliver_mail(c) assert_includes response.cc, c.email end should 'not deliver a copy of email if requester dont wants' do - ent = Enterprise.new(:name => 'my enterprise', :identifier => 'myent', :environment => Environment.default) + ent = Environment.default.enterprises.new(:name => 'my enterprise', :identifier => 'myent') c = build(Contact, :dest => ent, :email => 'requester@invalid.com', :receive_a_copy => false) response = Contact::Sender.deliver_mail(c) assert_nil response.cc -- libgit2 0.21.2