Ruby 2.6 works with faraday-typhoeus now (#88) (#90)

- Gemfile restrictions and README adjusted accordingly. No app changes.
- Patron tests don't work with Faraday 2 and JRuby, because Patron is
  now required for the Patron tests, and it doesn't support JRuby.
- Add a response assertion to the Typhoeus intergration tests.

Signed-off-by: Brian Hawley <[email protected]>
(cherry picked from commit 06758a9)

Co-authored-by: Brian Hawley <[email protected]>

opensearch-transport/Gemfile

@@ -37,7 +37,6 @@ if File.exist? File.expand_path('../opensearch/opensearch.gemspec', __dir__)
   gem 'opensearch-ruby', path: File.expand_path('../opensearch', __dir__), require: false
 end
 
-ENV['FARADAY_VERSION'] = '~> 1.0' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7')
 gem 'faraday', ENV['FARADAY_VERSION'], require: false if ENV.key?('FARADAY_VERSION')
 
 group :development, :test do

opensearch-transport/README.md

@@ -37,11 +37,11 @@ If you don't use Bundler, you may need to require the library explicitly (like `
 
 Currently these libraries will be automatically detected and used:
 - [Patron](https://github.com/toland/patron) through [faraday-patron](https://github.com/lostisland/faraday-patron)
-- [Typhoeus](https://github.com/typhoeus/typhoeus) through [faraday-typhoeus](https://github.com/dleavitt/faraday-typhoeus) for Faraday 2 or higher, or its built-in adapter for Faraday 1.
+- [Typhoeus](https://github.com/typhoeus/typhoeus) through [faraday-typhoeus](https://github.com/dleavitt/faraday-typhoeus) for Faraday 2 or higher, or Faraday's built-in adapter for Faraday 1.
 - [HTTPClient](https://rubygems.org/gems/httpclient) through [faraday-httpclient](https://github.com/lostisland/faraday-httpclient)
 - [Net::HTTP::Persistent](https://rubygems.org/gems/net-http-persistent) through [faraday-net_http_persistent](https://github.com/lostisland/faraday-net_http_persistent)
 
-**Note on [Typhoeus](https://github.com/typhoeus/typhoeus)**: You need to use v1.4.0 or up since older versions are not compatible with Faraday 1.0 or higher. You can't use Typhoeus with Faraday 2.0 or higher with Ruby versions less than 2.7 because [faraday-typhoeus](https://github.com/dleavitt/faraday-typhoeus) doesn't support it, so use Faraday 1.x and its built-in Typhoeus adapter.
+**Note on [Typhoeus](https://github.com/typhoeus/typhoeus)**: You need to use v1.4.0 or up since older versions are not compatible with Faraday 1.0 or higher.
 
 **Note on [Faraday](https://rubygems.org/gems/faraday)**: If you use Faraday 2.0 or higher, if the adapter is in a separate gem, you will likely need to declare that gem as well. Only the Net::HTTP adapter gem is included by default. Faraday 1.x includes most common adapter gems already.
 

opensearch-transport/opensearch-transport.gemspec

@@ -87,7 +87,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'test-unit', '~> 2'
   s.add_development_dependency 'typhoeus', '~> 1.4'
-  s.add_development_dependency 'faraday-typhoeus' if !ENV.key?('FARADAY_VERSION') && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7')
+  s.add_development_dependency 'faraday-typhoeus' if !ENV.key?('FARADAY_VERSION') && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6')
   s.add_development_dependency 'yard'
 
   s.description = <<-DESC.gsub(/^    /, '')

opensearch-transport/spec/opensearch/transport/client_spec.rb

@@ -247,7 +247,7 @@
       end unless jruby?
     end
 
-    context 'when the adapter is patron' do
+    context 'when the adapter is patron', unless: jruby? do
       let(:adapter) do
         client.transport.connections.all.first.connection.builder.adapter
       end
@@ -275,7 +275,7 @@
       end
     end unless jruby?
 
-    context 'when the adapter is specified as a string key' do
+    context 'when the adapter is specified as a string key', unless: jruby? do
       let(:adapter) do
         client.transport.connections.all.first.connection.builder.adapter
       end
@@ -305,7 +305,7 @@
       end
     end
 
-    context 'when the Faraday adapter is configured' do
+    context 'when the Faraday adapter is configured', unless: jruby? do
 
       let(:client) do
         described_class.new do |faraday|

opensearch-transport/test/integration/transport_test.rb

@@ -46,7 +46,11 @@ class OpenSearch::Transport::ClientIntegrationTest < Minitest::Test
         end
 
       client = OpenSearch::Transport::Client.new transport: transport
-      client.perform_request 'GET', ''
+      response = client.perform_request 'GET', ''
+
+      assert_respond_to(response.body, :to_hash)
+      assert_not_nil response.body['name']
+      assert_equal 'application/json; charset=UTF-8', response.headers['content-type']
     end unless jruby?
 
     should "allow to customize the Faraday adapter to NetHttpPersistent" do