fix: merging adapter options using Opts middleware

elixir-tesla · Sep 10, 2023 · c6df8f7 · c6df8f7
1 parent 7d5c53e
commit c6df8f7
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/lib/tesla/middleware/core.ex b/lib/tesla/middleware/core.ex
@@ -126,6 +126,16 @@ defmodule Tesla.Middleware.Opts do
 
   @impl Tesla.Middleware
   def call(env, next, opts) do
-    Tesla.run(%{env | opts: env.opts ++ opts}, next)
+    adapter =
+      env.opts
+      |> Keyword.get(:adapter, [])
+      |> Keyword.merge(opts[:adapter] || [])
+
+    opts =
+      env.opts
+      |> Keyword.merge(opts)
+      |> Keyword.merge(adapter: adapter)
+
+    Tesla.run(%{env | opts: opts}, next)
   end
 end
diff --git a/test/tesla/middleware/opts_test.exs b/test/tesla/middleware/opts_test.exs
@@ -12,6 +12,21 @@ defmodule Tesla.Middleware.OptsTest do
     adapter fn env -> env end
   end
 
+  defmodule MergeAdapterOptsClient do
+    use Tesla
+
+    plug Tesla.Middleware.Opts, adapter: [first_opt: "1"]
+    plug Tesla.Middleware.Opts, adapter: [second_opt: "2"]
+
+    adapter fn env -> env end
+  end
+
+  test "merge adapter opts" do
+    env = MergeAdapterOptsClient.get("/")
+
+    assert env.opts == [adapter: [first_opt: "1", second_opt: "2"]]
+  end
+
   test "apply middleware options" do
     env = Client.get("/")