Only require 'oj' gem if not using JRuby

Author: estolfo

elasticsearch-model/test/test_helper.rb

@@ -23,7 +23,7 @@
 require 'turn' unless ENV["TM_FILEPATH"] || ENV["NOTURN"] || defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
 
 require 'ansi'
-require 'oj'
+require 'oj' unless defined?(JRUBY_VERSION)
 
 require 'active_model'
 

elasticsearch-persistence/test/test_helper.rb

@@ -23,7 +23,7 @@
 require 'turn' unless ENV["TM_FILEPATH"] || ENV["NOTURN"] || defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
 
 require 'ansi'
-require 'oj'
+require 'oj' unless defined?(JRUBY_VERSION)
 
 require 'elasticsearch/extensions/test/cluster'
 require 'elasticsearch/extensions/test/startup_shutdown'

elasticsearch-rails/test/test_helper.rb

@@ -23,7 +23,7 @@
 require 'turn' unless ENV["TM_FILEPATH"] || ENV["NOTURN"] || defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
 
 require 'ansi'
-require 'oj'
+require 'oj' unless defined?(JRUBY_VERSION)
 
 require 'rails/version'
 require 'active_record'