Skip to content

Commit a64f305

Browse files
committed
Merge pull request #43 from dnrce/issue/42-escaped-xml
Handle escaped characters in assert_select_encoded
2 parents 46591c7 + f4d2951 commit a64f305

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lib/rails/dom/testing/assertions/selector_assertions.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,9 @@ def assert_select_encoded(element = nil, &block)
219219
end
220220

221221
content = nodeset(element || @selected).map do |elem|
222-
elem.children.select(&:cdata?).map(&:content)
222+
elem.children.select do |child|
223+
child.cdata? || (child.text? && !child.blank?)
224+
end.map(&:content)
223225
end.join
224226

225227
selected = Nokogiri::HTML::DocumentFragment.parse(content)

test/selector_assertions_test.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,7 @@ def test_feed_item_encoded
245245
</item>
246246
<item>
247247
<description>
248-
<![CDATA[
249-
<p>Test 2</p>
250-
]]>
248+
&lt;p&gt;Test 2&lt;/p&gt;
251249
</description>
252250
</item>
253251
</channel>

0 commit comments

Comments
 (0)