diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-07-16 04:59:44 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-16 04:59:44 +0900 |
| commit | 5254dacec7c803967b68124f38b1d047278143c2 (patch) | |
| tree | e170f2344a4097a536ea708e404a30ccafcf5b90 | |
| parent | ab9ad981cf896ebdaa1e98e929291b4be46616f8 (diff) | |
| parent | 3fb482132bdf075a5cb67f1de87f64520faf30f1 (diff) | |
| download | rails-5254dacec7c803967b68124f38b1d047278143c2.tar.gz rails-5254dacec7c803967b68124f38b1d047278143c2.tar.bz2 rails-5254dacec7c803967b68124f38b1d047278143c2.zip | |
Merge pull request #33366 from ahorek/fix_selector
fix test_should_impose_childless_html_tags_in_html failure with JRuby
| -rw-r--r-- | actionpack/test/controller/test_case_test.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb index 2d0b6cd602..dda2686a9b 100644 --- a/actionpack/test/controller/test_case_test.rb +++ b/actionpack/test/controller/test_case_test.rb @@ -401,7 +401,13 @@ XML process :test_xml_output, params: { response_as: "text/html" } # <area> auto-closes, so the <p> becomes a sibling - assert_select "root > area + p" + if defined?(JRUBY_VERSION) + # https://github.com/sparklemotion/nokogiri/issues/1653 + # HTML parser "fixes" "broken" markup in slightly different ways + assert_select "root > map > area + p" + else + assert_select "root > area + p" + end end def test_should_not_impose_childless_html_tags_in_xml |