Remove JRuby hacks, add 9.1 to CI matrix

Author: pirj

.github/workflows/ci.yml

@@ -27,10 +27,11 @@ jobs:
           - 2.4
           - 2.3
           - ruby-head
+          - jruby-9.1
           - jruby-9.2
           - jruby-head
       fail-fast: false
-    continue-on-error: ${{ matrix.ruby == 'jruby-9.2' || endsWith(matrix.ruby, 'head') }}
+    continue-on-error: ${{ endsWith(matrix.ruby, 'head') }}
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1

.travis.yml

@@ -1,6 +1,2 @@
-<%
-exclusions = []
-exclusions << ' --tags ~@no-jruby' if RUBY_PLATFORM == 'java'
-%>
-default: --require features --strict --format progress --tags ~@wip<%= exclusions.join %> features
+default: --require features --strict --format progress --tags ~@wip features
 wip:     --require features --tags @wip:30 --wip features

cucumber.yml

@@ -19,13 +19,13 @@ def command_for(locations, server)
           parts = []
 
           parts << RUBY << load_path
-          parts << open3_safe_escape(RSpec::Core.path_to_executable)
+          parts << escape(RSpec::Core.path_to_executable)
 
           parts << "--format"   << "bisect-drb"
           parts << "--drb-port" << server.drb_port
 
           parts.concat(reusable_cli_options)
-          parts.concat(locations.map { |l| open3_safe_escape(l) })
+          parts.concat(locations.map { |l| escape(l) })
 
           parts.join(" ")
         end
@@ -64,15 +64,6 @@ def spec_opts_without_bisect
       private
 
         include RSpec::Core::ShellEscape
-        # On JRuby, Open3.popen3 does not handle shellescaped args properly:
-        # https://github.com/jruby/jruby/issues/2767
-        if RSpec::Support::Ruby.jruby?
-          # :nocov:
-          alias open3_safe_escape quote
-          # :nocov:
-        else
-          alias open3_safe_escape escape
-        end
 
         def environment_repro_parts
           bisect_environment_hash.map do |k, v|
@@ -109,7 +100,7 @@ def parsed_original_cli_options
         end
 
         def load_path
-          @load_path ||= "-I#{$LOAD_PATH.map { |p| open3_safe_escape(p) }.join(':')}"
+          @load_path ||= "-I#{$LOAD_PATH.map { |p| escape(p) }.join(':')}"
         end
 
         # Path to the currently running Ruby executable, borrowed from Rake:

lib/rspec/core/bisect/shell_command.rb

@@ -2,12 +2,7 @@ function run_cukes {
   if [ -d features ]; then
     echo "${PWD}/bin/cucumber"
 
-    if is_mri_192; then
-      # For some reason we get SystemStackError on 1.9.2 when using
-      # the bin/cucumber approach below. That approach is faster
-      # (as it avoids the bundler tax), so we use it on rubies where we can.
-      bundle exec cucumber --strict
-    elif is_jruby; then
+    if is_jruby; then
       echo "WARNING: Cucumber is skipped on JRuby on rspec-core due to" \
            "excessive build times (>45 minutes) causing timeouts on Travis"
       return 0

script/custom_build_functions.sh

@@ -53,12 +53,7 @@ function run_cukes {
 
     echo "${PWD}/bin/cucumber"
 
-    if is_mri_192; then
-      # For some reason we get SystemStackError on 1.9.2 when using
-      # the bin/cucumber approach below. That approach is faster
-      # (as it avoids the bundler tax), so we use it on rubies where we can.
-      bundle exec cucumber --strict
-    elif is_jruby; then
+    if is_jruby; then
       # For some reason JRuby doesn't like our improved bundler setup
       RUBYOPT="-I${PWD}/../bundle -rbundler/setup" \
          PATH="${PWD}/bin:$PATH" \

script/functions.sh

@@ -57,7 +57,7 @@ def extract_backtrace_from(doc)
         end
 
         describe 'produced HTML', :slow do
-          it "is identical to the one we designed manually", :pending => (defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby') do
+          it "is identical to the one we designed manually", :pending => RSpec::Support::Ruby.jruby? do
             expect(actual_html).to eq(expected_html)
           end
         end

spec/rspec/core/formatters/html_formatter_spec.rb

@@ -279,7 +279,7 @@ def obj.foo(arg)
         end
       end
 
-      context 'when Ripper cannot parse the source (which can happen on JRuby -- see jruby/jruby#2427)', :isolated_directory do
+      context 'when Ripper cannot parse the source', :isolated_directory do
         let(:file_path) { 'invalid_source.rb' }
 
         let(:line_number) { 1 }