Merge pull request #316 from github/loosen-faraday_middleware

Unlock faraday_middleware version
github · Jun 5, 2024 · 80f5260 · 80f5260
2 parents 791a473 + e7470aa
commit 80f5260
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 6.1.1 (2024-06-05)
+- Unlock faraday_middleware version to allow 1.x
+
 ## 6.1.0 (2024-04-09)
 - Replace `Faraday::Error::*` with `Faraday::*` error classes
 - Handle all `Faraday::Error` instead of `Faraday::Error::ClientError`

diff --git a/elastomer-client.gemspec b/elastomer-client.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "addressable", "~> 2.5"
   spec.add_dependency "faraday",     ">= 0.17"
-  spec.add_dependency "faraday_middleware", "~> 0.14"
+  spec.add_dependency "faraday_middleware", ">= 0.14"
   spec.add_dependency "multi_json",  "~> 1.12"
   spec.add_dependency "semantic",    "~> 1.6"
 end
diff --git a/lib/elastomer_client/version.rb b/lib/elastomer_client/version.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ElastomerClient
-  VERSION = "6.1.0"
+  VERSION = "6.1.1"
 
   def self.version
     VERSION

diff --git a/test/client_test.rb b/test/client_test.rb
@@ -9,7 +9,7 @@
   it "uses the adapter specified at creation" do
     c = ElastomerClient::Client.new(adapter: :test)
 
-    assert_includes c.connection.builder.handlers, Faraday::Adapter::Test
+    assert_equal c.connection.builder.adapter, Faraday::Adapter::Test
   end
 
   it "allows configuring the Faraday when a block is given" do
@@ -28,7 +28,7 @@
     c = ElastomerClient::Client.new
     adapter = Faraday::Adapter.lookup_middleware(Faraday.default_adapter)
 
-    assert_includes c.connection.builder.handlers, adapter
+    assert_equal c.connection.builder.adapter, adapter
   end
 
   it "uses the same connection for all requests" do