Download as
Browse Code »

Commit 07f7b8503233c104b3559eb9e46b661d6ccf6382

Authored by Marcos Pereira
1 parent 7dbd8a28
Exists in staging and in 26 other branches all_pending_tasks_api, api_roles, comments_permissions, elasticsearch, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, follower_permition, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, profile_api_improvements, user_mention

html_safe for error message and test fix

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @07f7b85
... ... @@ -1130,7 +1130,7 @@ module ApplicationHelper
1130 1130 content_tag(:div, :class => 'errorExplanation', :id => 'errorExplanation') do
1131 1131 content_tag(:h2, _('Errors while saving')) +
1132 1132 content_tag(:ul) do
1133   - safe_join(errors.map { |err| content_tag(:li, err) })
  1133 + safe_join(errors.map { |err| content_tag(:li, err.html_safe) })
1134 1134 end
1135 1135 end
1136 1136 end
... ...
plugins/organization_ratings/test/functional/organization_ratings_plugin_profile_controller_test.rb
  Diff comments   View file @07f7b85
... ... @@ -46,7 +46,7 @@ class OrganizationRatingsPluginProfileControllerTest < ActionController::TestCas
46 46 test "do not create community_rating without a rate value" do
47 47 post :new_rating, profile: @community.identifier, :comments => {:body => ""}, :organization_rating_value => nil
48 48  
49   - assert_match "value: can't be blank", session[:notice]
  49 + assert_tag :tag => 'div', :attributes => {:class => /errorExplanation/}, :content => /Value can't be blank/
50 50 end
51 51  
52 52 test "do not create two ratings on Community when vote once config is true" do
... ...