From de1cde65a67cf9acb227b4df67230b47fdfc9a0e Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Sat, 30 May 2020 10:45:11 -0700
Subject: [PATCH] Moved request tests to test_internals_request.py

---
 tests/test_internals_request.py | 42 +++++++++++++++++++++++++++++++++
 tests/test_utils.py             | 40 -------------------------------
 2 files changed, 42 insertions(+), 40 deletions(-)
 create mode 100644 tests/test_internals_request.py

diff --git a/tests/test_internals_request.py b/tests/test_internals_request.py
new file mode 100644
index 00000000..5c9b254b
--- /dev/null
+++ b/tests/test_internals_request.py
@@ -0,0 +1,42 @@
+from datasette.utils.asgi import Request
+import pytest
+
+
+@pytest.mark.asyncio
+async def test_request_post_vars():
+    scope = {
+        "http_version": "1.1",
+        "method": "POST",
+        "path": "/",
+        "raw_path": b"/",
+        "query_string": b"",
+        "scheme": "http",
+        "type": "http",
+        "headers": [[b"content-type", b"application/x-www-form-urlencoded"]],
+    }
+
+    async def receive():
+        return {"type": "http.request", "body": b"foo=bar&baz=1", "more_body": False}
+
+    request = Request(scope, receive)
+    assert {"foo": "bar", "baz": "1"} == await request.post_vars()
+
+
+def test_request_args():
+    request = Request.fake("/foo?multi=1&multi=2&single=3")
+    assert "1" == request.args.get("multi")
+    assert "3" == request.args.get("single")
+    assert "1" == request.args["multi"]
+    assert "3" == request.args["single"]
+    assert ["1", "2"] == request.args.getlist("multi")
+    assert [] == request.args.getlist("missing")
+    assert "multi" in request.args
+    assert "single" in request.args
+    assert "missing" not in request.args
+    expected = ["multi", "single"]
+    assert expected == list(request.args.keys())
+    for i, key in enumerate(request.args):
+        assert expected[i] == key
+    assert 2 == len(request.args)
+    with pytest.raises(KeyError):
+        request.args["missing"]
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 9d6f45b0..01a10468 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -428,46 +428,6 @@ def test_check_connection_passes():
     utils.check_connection(conn)
 
 
-@pytest.mark.asyncio
-async def test_request_post_vars():
-    scope = {
-        "http_version": "1.1",
-        "method": "POST",
-        "path": "/",
-        "raw_path": b"/",
-        "query_string": b"",
-        "scheme": "http",
-        "type": "http",
-        "headers": [[b"content-type", b"application/x-www-form-urlencoded"]],
-    }
-
-    async def receive():
-        return {"type": "http.request", "body": b"foo=bar&baz=1", "more_body": False}
-
-    request = Request(scope, receive)
-    assert {"foo": "bar", "baz": "1"} == await request.post_vars()
-
-
-def test_request_args():
-    request = Request.fake("/foo?multi=1&multi=2&single=3")
-    assert "1" == request.args.get("multi")
-    assert "3" == request.args.get("single")
-    assert "1" == request.args["multi"]
-    assert "3" == request.args["single"]
-    assert ["1", "2"] == request.args.getlist("multi")
-    assert [] == request.args.getlist("missing")
-    assert "multi" in request.args
-    assert "single" in request.args
-    assert "missing" not in request.args
-    expected = ["multi", "single"]
-    assert expected == list(request.args.keys())
-    for i, key in enumerate(request.args):
-        assert expected[i] == key
-    assert 2 == len(request.args)
-    with pytest.raises(KeyError):
-        request.args["missing"]
-
-
 def test_call_with_supported_arguments():
     def foo(a, b):
         return "{}+{}".format(a, b)