From eba6eb0c70d0c9a427984ae701e11e5f5340603a Mon Sep 17 00:00:00 2001 From: aycabta Date: Fri, 10 Nov 2017 04:02:11 +0900 Subject: [PATCH 1/2] Bump JRuby version to 9.1.14.0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7dff74823d..b40c3b0d1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ rvm: - 2.3.5 - 2.4.2 - ruby-head - - jruby-9.1.13.0 + - jruby-9.1.14.0 env: global: NOBENCHMARK=1 From 475e667ab26eb3d2759abb490ab8033503127ada Mon Sep 17 00:00:00 2001 From: aycabta Date: Fri, 10 Nov 2017 04:47:10 +0900 Subject: [PATCH 2/2] Remove skipping test because JRuby bug was fixed --- test/test_rdoc_markup_to_html.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/test_rdoc_markup_to_html.rb b/test/test_rdoc_markup_to_html.rb index b5edeb04d2..fd8a7bb0ca 100644 --- a/test/test_rdoc_markup_to_html.rb +++ b/test/test_rdoc_markup_to_html.rb @@ -452,9 +452,6 @@ def test_accept_verbatim_parseable_error end def test_accept_verbatim_nl_after_backslash - # TODO: Remove "skip" after the issue is resolved: https://github.com/jruby/jruby/issues/4787 - # This "skip" is for strange behavior around escaped newline on JRuby - skip if defined? JRUBY_VERSION verb = @RM::Verbatim.new("a = 1 if first_flag_var and \\\n", " this_is_flag_var\n") @to.start_accepting