github/jquery-rails
1
1
Fork 0
mirror of https://github.com/rails/jquery-rails.git synced 2026-01-09 14:47:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into support_even_more_css_selectors

Browse Source
This commit is contained in:
Rafael França
2017-05-11 22:15:37 -07:00
committed by GitHub
parent bfda05701a a3ed1644e7
commit 3b2b33a8c7
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/jquery/assert_select.rb
View File

@@ -47,7 +47,7 @@ module Rails::Dom::Testing::Assertions::SelectorAssertions
# assert_select '.product'
# end
PATTERN_HTML = "['\"]((\\\\\"|[^\"])*)['\"]"
PATTERN_HTML = "['\"]((\\\\\"|\\\\'|[^\"'])*)['\"]"
PATTERN_UNICODE_ESCAPED_CHAR = /\\u([0-9a-zA-Z]{4})/
SKELETAL_PATTERN = "(?:jQuery|\\$)\\(%s\\)\\.%s\\(%s\\);"
@@ -91,14 +91,14 @@ module Rails::Dom::Testing::Assertions::SelectorAssertions
if block_given?
@selected ||= nil
fragments = Nokogiri::HTML::Document.new
fragments = Nokogiri::HTML::Document.new.fragment
if matched_pattern
response.body.scan(Regexp.new(matched_pattern)).each do |match|
flunk 'This function can\'t have HTML argument' if match.is_a?(String)
doc = Nokogiri::HTML::Document.parse(unescape_js(match.first))
doc.root.children.each do |child|
doc = Nokogiri::HTML::DocumentFragment.parse(unescape_js(match.first))
doc.children.each do |child|
fragments << child if child.element?
end
end