Download as
Browse Code »

Commit abc262e15b5af4e5029e1affb35caf07d14a8724

Authored by Daniela Feitosa
1 parent 877d26ae
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Fixed failing tests

Showing 2 changed files with 23 additions and 4 deletions   Show diff stats
app/views/contact/new.rhtml
  Diff comments   View file @abc262e
1 -<h1><%= _('Send an e-mail to administrators') %></h1> 1 +<% if profile.person? %>
  2 + <h1><%= _('Send an e-mail to %s') % profile.name %></h1>
  3 +<% else %>
  4 + <h1><%= _('Send an e-mail to administrators') %></h1>
2 5
3 -<div class='tooltip'><%= _("The e-mail will be sent to the administrator of community '%s'") % profile.name %></div> 6 + <div class='tooltip'><%= _("The e-mail will be sent to the administrators of community '%s'") % profile.name %></div>
  7 +<% end %>
4 8
5 <%= error_messages_for 'contact' %> 9 <%= error_messages_for 'contact' %>
6 10
test/functional/contact_controller_test.rb
  Diff comments   View file @abc262e
@@ -25,9 +25,24 @@ class ContactControllerTest &lt; ActionController::TestCase @@ -25,9 +25,24 @@ class ContactControllerTest &lt; ActionController::TestCase
25 assert_response :success 25 assert_response :success
26 end 26 end
27 27
28 - should 'display destinatary name in title' do 28 + should 'display destinatary name in title if profile is a person' do
  29 + get :new, :profile => profile.identifier
  30 + assert_tag :tag => 'h1', :content => /Send.*#{profile.name}/
  31 + end
  32 +
  33 + should 'display administrators in title if profile is an organization' do
29 get :new, :profile => enterprise.identifier 34 get :new, :profile => enterprise.identifier
30 - assert_tag :tag => 'h1', :content => /Send.*#{enterprise.name}/ 35 + assert_tag :tag => 'h1', :content => /Send.*administrators/
  36 + end
  37 +
  38 + should 'display profile name in tooltip if profile is an organization' do
  39 + get :new, :profile => enterprise.identifier
  40 + assert_tag :tag => 'div', :content => /administrators.*#{enterprise.name}/, :attributes => {:class => 'tooltip'}
  41 + end
  42 +
  43 + should 'not display tooltip if profile is a person' do
  44 + get :new, :profile => profile.identifier
  45 + assert_no_tag :tag => 'div', :attributes => {:class => 'tooltip'}
31 end 46 end
32 47
33 should 'add form to create contact via post' do 48 should 'add form to create contact via post' do