Download as
Browse Code »

Commit 50fc6378df6ecb5e41ed862e1e669faa3aa947bc

Authored by Rodrigo Souto
1 parent 58785a4e
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails3: fix contact_sender

Showing 2 changed files with 9 additions and 9 deletions   Show diff stats
app/mailers/contact.rb
  Diff comments   View file @50fc637
@@ -50,7 +50,7 @@ class Contact @@ -50,7 +50,7 @@ class Contact
50 } 50 }
51 51
52 if contact.sender 52 if contact.sender
53 - options.merge!(headers: {'X-Noosfero-Sender' => contact.sender.identifier}) 53 + options.merge!('X-Noosfero-Sender' => contact.sender.identifier)
54 end 54 end
55 55
56 if contact.receive_a_copy 56 if contact.receive_a_copy
test/unit/contact_sender_test.rb
  Diff comments   View file @50fc637
@@ -15,8 +15,8 @@ class ContactSenderTest < ActiveSupport::TestCase @@ -15,8 +15,8 @@ class ContactSenderTest < ActiveSupport::TestCase
15 ent = Environment.default.enterprises.new(:name => 'my enterprise', :identifier => 'myent') 15 ent = Environment.default.enterprises.new(:name => 'my enterprise', :identifier => 'myent')
16 ent.contact_email = 'contact@invalid.com' 16 ent.contact_email = 'contact@invalid.com'
17 c = build(Contact, :dest => ent) 17 c = build(Contact, :dest => ent)
18 - response = Contact::Sender.deliver_mail(c)  
19 - assert_equal Environment.default.contact_email, response.from.to_s 18 + response = Contact::Sender.notification(c).deliver
  19 + assert_equal Environment.default.contact_email, response.from.first.to_s
20 assert_equal "[#{ent.name}] #{c.subject}", response.subject 20 assert_equal "[#{ent.name}] #{c.subject}", response.subject
21 end 21 end
22 22
@@ -24,7 +24,7 @@ class ContactSenderTest < ActiveSupport::TestCase @@ -24,7 +24,7 @@ class ContactSenderTest < ActiveSupport::TestCase
24 ent = Environment.default.enterprises.new(:name => 'my enterprise', :identifier => 'myent') 24 ent = Environment.default.enterprises.new(:name => 'my enterprise', :identifier => 'myent')
25 ent.contact_email = 'contact@invalid.com' 25 ent.contact_email = 'contact@invalid.com'
26 c = build(Contact, :dest => ent) 26 c = build(Contact, :dest => ent)
27 - response = Contact::Sender.deliver_mail(c) 27 + response = Contact::Sender.notification(c).deliver
28 assert_includes response.to, c.dest.contact_email 28 assert_includes response.to, c.dest.contact_email
29 end 29 end
30 30
@@ -35,28 +35,28 @@ class ContactSenderTest < ActiveSupport::TestCase @@ -35,28 +35,28 @@ class ContactSenderTest < ActiveSupport::TestCase
35 ent.add_admin(admin) 35 ent.add_admin(admin)
36 assert ent.save! 36 assert ent.save!
37 c = build(Contact, :dest => ent) 37 c = build(Contact, :dest => ent)
38 - response = Contact::Sender.deliver_mail(c) 38 + response = Contact::Sender.notification(c).deliver
39 assert_includes response.to, admin.email 39 assert_includes response.to, admin.email
40 end 40 end
41 41
42 should 'deliver a copy of email if requester wants' do 42 should 'deliver a copy of email if requester wants' do
43 ent = Environment.default.enterprises.new(:name => 'my enterprise', :identifier => 'myent') 43 ent = Environment.default.enterprises.new(:name => 'my enterprise', :identifier => 'myent')
44 c = build(Contact, :dest => ent, :email => 'requester@invalid.com', :receive_a_copy => true) 44 c = build(Contact, :dest => ent, :email => 'requester@invalid.com', :receive_a_copy => true)
45 - response = Contact::Sender.deliver_mail(c) 45 + response = Contact::Sender.notification(c).deliver
46 assert_includes response.cc, c.email 46 assert_includes response.cc, c.email
47 end 47 end
48 48
49 should 'not deliver a copy of email if requester dont wants' do 49 should 'not deliver a copy of email if requester dont wants' do
50 ent = Environment.default.enterprises.new(:name => 'my enterprise', :identifier => 'myent') 50 ent = Environment.default.enterprises.new(:name => 'my enterprise', :identifier => 'myent')
51 c = build(Contact, :dest => ent, :email => 'requester@invalid.com', :receive_a_copy => false) 51 c = build(Contact, :dest => ent, :email => 'requester@invalid.com', :receive_a_copy => false)
52 - response = Contact::Sender.deliver_mail(c) 52 + response = Contact::Sender.notification(c).deliver
53 assert_nil response.cc 53 assert_nil response.cc
54 end 54 end
55 55
56 should 'only deliver mail to email of person' do 56 should 'only deliver mail to email of person' do
57 person = create_user('contacted_user').person 57 person = create_user('contacted_user').person
58 c = build(Contact, :dest => person) 58 c = build(Contact, :dest => person)
59 - response = Contact::Sender.deliver_mail(c) 59 + response = Contact::Sender.notification(c).deliver
60 assert_equal [person.email], response.to 60 assert_equal [person.email], response.to
61 end 61 end
62 62
@@ -64,7 +64,7 @@ class ContactSenderTest < ActiveSupport::TestCase @@ -64,7 +64,7 @@ class ContactSenderTest < ActiveSupport::TestCase
64 recipient = create_user('contacted_user').person 64 recipient = create_user('contacted_user').person
65 sender = create_user('sender_user').person 65 sender = create_user('sender_user').person
66 c = build(Contact, :dest => recipient, :sender => sender) 66 c = build(Contact, :dest => recipient, :sender => sender)
67 - sent_message = Contact::Sender.deliver_mail(c) 67 + sent_message = Contact::Sender.notification(c).deliver
68 assert_equal 'sender_user', sent_message['X-Noosfero-Sender'].to_s 68 assert_equal 'sender_user', sent_message['X-Noosfero-Sender'].to_s
69 end 69 end
70 70