Download as
Browse Code »

Commit 5d783a7e4a2c6ceed45ce9573cba13ef03af5963

Authored by Braulio Bhavamitra
1 parent 92267854
Exists in master and in 20 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, 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, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails4: check tag content

Showing 1 changed file with 7 additions and 1 deletions   Show diff stats
test/test_helper.rb
  Diff comments   View file @5d783a7
@@ -138,12 +138,18 @@ class ActiveSupport::TestCase @@ -138,12 +138,18 @@ class ActiveSupport::TestCase
138 def find_tag_in_string text, options 138 def find_tag_in_string text, options
139 doc = Nokogiri::HTML.fragment text 139 doc = Nokogiri::HTML.fragment text
140 tag = doc.css(options[:tag]).first 140 tag = doc.css(options[:tag]).first
  141 + content = tag.text.strip
  142 +
141 attributes = {}; tag.attributes.each do |a, v| 143 attributes = {}; tag.attributes.each do |a, v|
142 a = a.to_sym 144 a = a.to_sym
143 next unless options[:attributes].has_key? a 145 next unless options[:attributes].has_key? a
144 attributes[a] = v.value 146 attributes[a] = v.value
145 end 147 end
146 - tag if (tag and attributes == options[:attributes]) 148 +
  149 + ret = tag.present?
  150 + ret &&= options[:attributes].blank? || attributes == options[:attributes]
  151 + ret &&= options[:content].blank? || content == options[:content]
  152 + ret
147 end 153 end
148 154
149 def assert_tag_in_string(text, options) 155 def assert_tag_in_string(text, options)