Skip to content

[9.3] Revert "[Tests] Skips jbuilder for specific version of JRuby" #2989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
picandocodigo merged 1 commit into from
Jun 18, 2026
Merged

[9.3] Revert "[Tests] Skips jbuilder for specific version of JRuby" #2989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions elasticsearch-api/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,10 @@ group :development do
else
gem 'debug'
end
# Related to https://github.com/ruby-i18n/i18n/issues/735
# Keeping here for compatiblity with JRuby 9.x
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.2') &&
Gem::Version.new(RUBY_VERSION) > Gem::Version.new('2.6')
gem 'i18n', '1.14'
end
end
8 changes: 1 addition & 7 deletions elasticsearch-api/spec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,12 @@
end
require 'elasticsearch'
require 'elasticsearch-api'
require 'jbuilder'
require 'jsonify'
require 'logger'
require 'openssl'
require 'yaml'

# TODO: There is a dependency issue with JRuby 9.4.15.0 and JBuilder at the moment:
def jruby_exception?
defined?(JRUBY_VERSION) &&
JRUBY_VERSION.between?('9.4', '9.5')
end
require 'jbuilder' unless jruby_exception?

tracer = ::Logger.new(STDERR)
tracer.formatter = lambda { |s, d, p, m| "#{m.gsub(/^.*$/) { |n| ' ' + n } }\n" }

Expand Down
3 changes: 1 addition & 2 deletions elasticsearch-api/spec/unit/actions/json_builders_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,4 @@
expect(client_double.search(body: json)).to be_a Elasticsearch::API::Response
end
end
end unless jruby_exception?
# TODO: Exception for JRuby v9.4.15.0 ^
end
Loading