Headers should override emulation defaults per request

Author: zyc9012

ext/wreq_rb/src/client.rs

@@ -445,6 +445,21 @@ fn apply_request_options(
     mut req: wreq::RequestBuilder,
     opts: &RHash,
 ) -> Result<wreq::RequestBuilder, magnus::Error> {
+    if let Some(val) = hash_get_value(opts, "emulation")? {
+        let ruby = unsafe { Ruby::get_unchecked() };
+        if val.is_kind_of(ruby.class_false_class()) {
+            // emulation: false — no per-request emulation override
+        } else if val.is_kind_of(ruby.class_true_class()) {
+            let opt = build_emulation_option(DEFAULT_EMULATION, opts)?;
+            req = req.emulation(opt);
+        } else {
+            let name: String = TryConvert::try_convert(val)?;
+            let emu = parse_emulation(&name)?;
+            let opt = build_emulation_option(emu, opts)?;
+            req = req.emulation(opt);
+        }
+    }
+
     if let Some(hdr_hash) = hash_get_hash(opts, "headers")? {
         let hmap = hash_to_header_map(&hdr_hash)?;
         req = req.headers(hmap);
@@ -499,21 +514,6 @@ fn apply_request_options(
         req = req.proxy(proxy);
     }
 
-    if let Some(val) = hash_get_value(opts, "emulation")? {
-        let ruby = unsafe { Ruby::get_unchecked() };
-        if val.is_kind_of(ruby.class_false_class()) {
-            // emulation: false — no per-request emulation override
-        } else if val.is_kind_of(ruby.class_true_class()) {
-            let opt = build_emulation_option(DEFAULT_EMULATION, opts)?;
-            req = req.emulation(opt);
-        } else {
-            let name: String = TryConvert::try_convert(val)?;
-            let emu = parse_emulation(&name)?;
-            let opt = build_emulation_option(emu, opts)?;
-            req = req.emulation(opt);
-        }
-    }
-
     Ok(req)
 }
 

test/request_test.rb

@@ -89,4 +89,14 @@ def test_headers_with_mixed_types
     assert_nil body["headers"]["X-Nil"]
     assert_equal "ok", body["headers"]["X-Str"]
   end
+
+  def test_headers_override_emulation_defaults
+    custom_ua = "MyCustomAgent/1.0"
+    resp = Wreq.get("https://httpbin.org/headers",
+      emulation: "chrome_145",
+      headers: { "User-Agent" => custom_ua })
+    assert_equal 200, resp.status
+    body = resp.json
+    assert_equal custom_ua, body["headers"]["User-Agent"]
+  end
 end