Fix files pattern not handling str and BytesIO (#260)

Author: lundberg

respx/patterns.py

@@ -1,3 +1,4 @@
+import io
 import json as jsonlib
 import operator
 import pathlib
@@ -562,7 +563,7 @@ class Files(MultiItemsMixin, Pattern):
     key = "files"
     value: MultiItems
 
-    def _normalize_file_value(self, value: FileTypes) -> Tuple[Any, ...]:
+    def _normalize_file_value(self, value: FileTypes) -> Tuple[Any, Any]:
         # Mimic httpx `FileField` to normalize `files` kwarg to shortest tuple style
         if isinstance(value, tuple):
             filename, fileobj = value[:2]
@@ -573,6 +574,12 @@ def _normalize_file_value(self, value: FileTypes) -> Tuple[Any, ...]:
                 filename = ANY
             fileobj = value
 
+        # Normalize file-like objects and strings to bytes to allow equality check
+        if isinstance(fileobj, io.BytesIO):
+            fileobj = fileobj.read()
+        elif isinstance(fileobj, str):
+            fileobj = fileobj.encode()
+
         return filename, fileobj
 
     def clean(self, value: RequestFiles) -> MultiItems:

tests/test_patterns.py

@@ -1,3 +1,4 @@
+import io
 import re
 from unittest.mock import ANY
 
@@ -456,6 +457,18 @@ def test_data_pattern(lookup, data, request_data, expected):
             },
             False,
         ),
+        (
+            Lookup.EQUAL,
+            {"file_1": ("filename.png", io.BytesIO(b"some..image..data"), "image/png")},
+            None,
+            True,
+        ),
+        (
+            Lookup.EQUAL,
+            {"file_1": ("filename.png", "some..image..data", "image/png")},  # str data
+            {"file_1": ("filename.png", io.BytesIO(b"some..image..data"), "image/png")},
+            True,
+        ),
         (
             Lookup.CONTAINS,
             {
@@ -487,6 +500,15 @@ def test_data_pattern(lookup, data, request_data, expected):
             },
             True,
         ),
+        (
+            Lookup.CONTAINS,
+            {"file_1": "foo..."},  # str data
+            {
+                "file_1": ("filename_1.txt", io.BytesIO(b"foo...")),
+                "file_2": ("filename_2.txt", io.BytesIO(b"bar...")),
+            },
+            True,
+        ),
         (
             Lookup.CONTAINS,
             [("file_1", b"ham...")],