From 50fc6378df6ecb5e41ed862e1e669faa3aa947bc Mon Sep 17 00:00:00 2001
From: Rodrigo Souto <rodrigo@colivre.coop.br>
Date: Fri, 6 Sep 2013 03:22:57 +0000
Subject: [PATCH] rails3: fix contact_sender

---
 app/mailers/contact.rb           |  2 +-
 test/unit/contact_sender_test.rb | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/mailers/contact.rb b/app/mailers/contact.rb
index 8e53703..208aa68 100644
--- a/app/mailers/contact.rb
+++ b/app/mailers/contact.rb
@@ -50,7 +50,7 @@ class Contact
       }
 
       if contact.sender
-        options.merge!(headers: {'X-Noosfero-Sender' => contact.sender.identifier})
+        options.merge!('X-Noosfero-Sender' => contact.sender.identifier)
       end
 
       if contact.receive_a_copy
diff --git a/test/unit/contact_sender_test.rb b/test/unit/contact_sender_test.rb
index 5962eee..3576629 100644
--- a/test/unit/contact_sender_test.rb
+++ b/test/unit/contact_sender_test.rb
@@ -15,8 +15,8 @@ class ContactSenderTest < ActiveSupport::TestCase
     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)
-    assert_equal Environment.default.contact_email, response.from.to_s
+    response = Contact::Sender.notification(c).deliver
+    assert_equal Environment.default.contact_email, response.from.first.to_s
     assert_equal "[#{ent.name}] #{c.subject}", response.subject
   end
 
@@ -24,7 +24,7 @@ class ContactSenderTest < ActiveSupport::TestCase
     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)
+    response = Contact::Sender.notification(c).deliver
     assert_includes response.to, c.dest.contact_email
   end
  
@@ -35,28 +35,28 @@ class ContactSenderTest < ActiveSupport::TestCase
     ent.add_admin(admin)
     assert ent.save!
     c = build(Contact, :dest => ent)
-    response = Contact::Sender.deliver_mail(c)
+    response = Contact::Sender.notification(c).deliver
     assert_includes response.to, admin.email
   end
 
   should 'deliver a copy of email if requester wants' do
     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)
+    response = Contact::Sender.notification(c).deliver
     assert_includes response.cc, c.email
   end
 
   should 'not deliver a copy of email if requester dont wants' do
     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)
+    response = Contact::Sender.notification(c).deliver
     assert_nil response.cc
   end
 
   should 'only deliver mail to email of person' do
     person = create_user('contacted_user').person
     c = build(Contact, :dest => person)
-    response = Contact::Sender.deliver_mail(c)
+    response = Contact::Sender.notification(c).deliver
     assert_equal [person.email], response.to
   end
 
@@ -64,7 +64,7 @@ class ContactSenderTest < ActiveSupport::TestCase
     recipient = create_user('contacted_user').person
     sender = create_user('sender_user').person
     c = build(Contact, :dest => recipient, :sender => sender)
-    sent_message = Contact::Sender.deliver_mail(c)
+    sent_message = Contact::Sender.notification(c).deliver
     assert_equal 'sender_user', sent_message['X-Noosfero-Sender'].to_s
   end
 
--
libgit2 0.21.2