Move opaque id to the end of the middleware chain

lib/elastomer_client/client.rb

@@ -134,7 +134,6 @@ def connection
         # Request compressed responses from ES and decompress them
         conn.use(:gzip)
         conn.request(:encode_json)
-        conn.request(:opaque_id) if @opaque_id
         conn.request(:limit_size, max_request_size:) if max_request_size
         conn.request(:elastomer_compress, compression:) if compress_body
 
@@ -149,6 +148,8 @@ def connection
 
         @connection_block&.call(conn)
 
+        conn.request(:opaque_id) if @opaque_id
+
         if @adapter.is_a?(Array)
           conn.adapter(*@adapter)
         else

test/client_test.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require File.expand_path("../test_helper", __FILE__)
+require File.expand_path("../mock_response", __FILE__)
 require "elastomer_client/notifications"
 
 describe ElastomerClient::Client do
@@ -414,4 +415,16 @@
       refute_same $client.connection, client.connection
     end
   end
+
+  it "does not throw OpaqueIdError for mocked response with empty opaque id" do
+    opts = $client_params.merge \
+      opaque_id: true
+    client = ElastomerClient::Client.new(**opts) do |connection|
+      connection.request(:mock_response) { |env| env.body = "{}" }
+    end
+
+    response = client.get("/")
+
+    assert_equal "yes", response.headers["Fake"]
+  end
 end

test/mock_response.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module ElastomerClient
+  module Middleware
+    class MockResponse < Faraday::Middleware
+      def initialize(app, &block)
+        super(app)
+        @response_block = block
+      end
+
+      def call(env)
+        env.clear_body if env.needs_body?
+
+        env.status = 200
+        env.response_headers = ::Faraday::Utils::Headers.new
+        env.response_headers["Fake"] = "yes"
+        env.response = ::Faraday::Response.new
+
+        @response_block&.call(env)
+
+        env.response.finish(env) unless env.parallel?
+
+        env.response
+      end
+    end
+  end
+end
+
+Faraday::Request.register_middleware \
+  mock_response: ElastomerClient::Middleware::MockResponse