Download as
Browse Code »

Commit c8e36b08bc643c05006df2e2eefa1c043e819e69

Authored by Daniela Feitosa
1 parent 4ef1070c
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

Fixed some tests 

(ActionItem2042)
Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
app/views/contact/sender/mail.rhtml
  Diff comments   View file @c8e36b0
@@ -8,8 +8,8 @@ @@ -8,8 +8,8 @@
8 {:sender => @name, :target => @target, :environment => @environment} %></p> 8 {:sender => @name, :target => @target, :environment => @environment} %></p>
9 <%= _('Information about the user who sent this message:')%> 9 <%= _('Information about the user who sent this message:')%>
10 <ul> 10 <ul>
11 - <li><%= content_tag('b', _('Name')+': ') + @name%></li>  
12 - <li><%= content_tag('b', _('Email')+': ') + @email%></li> 11 + <li><%= content_tag('b', _('Name')+': ') + @name.to_s %></li>
  12 + <li><%= content_tag('b', _('Email')+': ') + @email.to_s %></li>
13 <% if @city || @state %> 13 <% if @city || @state %>
14 <li><%= content_tag('b', _('City and state')+': ') + (@city || '?')+'/'+(@state || '?') %></li> 14 <li><%= content_tag('b', _('City and state')+': ') + (@city || '?')+'/'+(@state || '?') %></li>
15 <% end %> 15 <% end %>
test/unit/contact_sender_test.rb
  Diff comments   View file @c8e36b0
@@ -16,8 +16,8 @@ class ContactSenderTest &lt; Test::Unit::TestCase @@ -16,8 +16,8 @@ class ContactSenderTest &lt; Test::Unit::TestCase
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) 18 response = Contact::Sender.deliver_mail(c)
19 - assert_equal c.email, response.from  
20 - assert_equal c.subject, response.subject 19 + assert_equal Environment.default.contact_email, response.from.to_s
  20 + assert_equal "[#{ent.name}] #{c.subject}", response.subject
21 end 21 end
22 22
23 should 'deliver mail to contact_email' do 23 should 'deliver mail to contact_email' do