Merge pull request #9597 from koic/ci_against_jruby_9_2_16_0

CI against latest stable version of JRuby (9.2.16.0)
rubocop · Mar 12, 2021 · 972656f · 972656f
2 parents bd7f60b + 6c08520
commit 972656f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -187,32 +187,23 @@ jobs:
   # JRuby 9.2
   jruby-9.2-spec:
     docker:
-      # FIXME: Workaround for JRuby 9.2.15.0.
-      # Please specify `circleci/jruby:9.2` when the following issue will be resolved.
-      # https://github.com/jruby/jruby/issues/6581
-      - image: circleci/jruby:9.2.14
+      - image: circleci/jruby:9.2
     environment:
       <<: *common_env
       <<: *jruby_env
     steps:
       *spec_steps
   jruby-9.2-ascii_spec:
     docker:
-      # FIXME: Workaround for JRuby 9.2.15.0.
-      # Please specify `circleci/jruby:9.2` when the following issue will be resolved.
-      # https://github.com/jruby/jruby/issues/6581
-      - image: circleci/jruby:9.2.14
+      - image: circleci/jruby:9.2
     environment:
       <<: *common_env
       <<: *jruby_env
     steps:
       *ascii_spec_steps
   jruby-9.2-rubocop:
     docker:
-      # FIXME: Workaround for JRuby 9.2.15.0.
-      # Please specify `circleci/jruby:9.2` when the following issue will be resolved.
-      # https://github.com/jruby/jruby/issues/6581
-      - image: circleci/jruby:9.2.14
+      - image: circleci/jruby:9.2
     environment:
       <<: *common_env
       <<: *jruby_env

diff --git a/spec/rubocop/cli/options_spec.rb b/spec/rubocop/cli/options_spec.rb
@@ -1183,11 +1183,6 @@ def full_description_of_cop(cop)
 
       it 'prints all cops in their right department listing' do
         lines = stdout.lines
-        # FIXME: Remove the following workaround condition for JRuby.
-        # https://github.com/jruby/jruby/issues/6528
-        if RUBY_ENGINE == 'jruby' && Encoding.default_external == Encoding::ASCII
-          lines = lines.select(&:valid_encoding?)
-        end
         lines.slice_before(/Department /).each do |slice|
           departments = registry.departments.map(&:to_s)
           current =