🎨 reformat tests to remove some duplicate lines

spiderweb/middleware/cors.py

@@ -23,6 +23,7 @@ class VerifyValidCorsSetting(ServerCheck):
         " `cors_allowed_origins`, `cors_allowed_origin_regexes`, or"
         " `cors_allow_all_origins`.",
     )
+
     def check(self):
         # - `cors_allowed_origins`
         # - `cors_allowed_origin_regexes`
@@ -150,9 +151,8 @@ class CorsMiddleware(SpiderwebMiddleware):
             self.add_response_headers(request, resp)
             return resp
 
-    def process_response(
+    def process_response(self, request: Request, response: HttpResponse) -> None:
-        self, request: Request, response: HttpResponse
-    ) -> None:
         self.add_response_headers(request, response)
 
+
 # [204]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/OPTIONS#status_code

spiderweb/middleware/csrf.py

@@ -72,7 +72,9 @@ class CSRFMiddleware(SpiderwebMiddleware):
 
     def is_trusted_origin(self, request) -> bool:
         origin = request.headers.get("http_origin")
-        referrer = request.headers.get("http_referer") or request.headers.get("http_referrer")
+        referrer = request.headers.get("http_referer") or request.headers.get(
+            "http_referrer"
+        )
         host = request.headers.get("http_host")
 
         if not origin and not (host == referrer):

spiderweb/tests/helpers.py

@@ -18,11 +18,13 @@ class StartResponse:
         return {h[0]: h[1] for h in self.headers}
 
 
-def setup():
+def setup(**kwargs):
     environ = {}
     setup_testing_defaults(environ)
+    if "db" not in kwargs:
+        kwargs["db"] = SqliteDatabase("spiderweb-tests.db")
     return (
-        SpiderwebRouter(db=SqliteDatabase("spiderweb-tests.db")),
+        SpiderwebRouter(**kwargs),
         environ,
         StartResponse(),
     )

spiderweb/tests/test_middleware.py

@@ -4,7 +4,7 @@ from datetime import timedelta
 import pytest
 from peewee import SqliteDatabase
 
-from spiderweb import SpiderwebRouter, HttpResponse, ConfigError, StartupErrors
+from spiderweb import SpiderwebRouter, HttpResponse, StartupErrors
 from spiderweb.constants import DEFAULT_ENCODING
 from spiderweb.middleware.sessions import Session
 from spiderweb.middleware import csrf
@@ -37,10 +37,8 @@ def index(request):
 
 
 def test_session_middleware():
-    _, environ, start_response = setup()
+    app, environ, start_response = setup(
-    app = SpiderwebRouter(
         middleware=["spiderweb.middleware.sessions.SessionMiddleware"],
-        db=SqliteDatabase("spiderweb-tests.db"),
     )
 
     app.add_route("/", index)
@@ -58,10 +56,8 @@ def test_session_middleware():
 
 
 def test_expired_session():
-    _, environ, start_response = setup()
+    app, environ, start_response = setup(
-    app = SpiderwebRouter(
         middleware=["spiderweb.middleware.sessions.SessionMiddleware"],
-        db=SqliteDatabase("spiderweb-tests.db"),
     )
 
     app.add_route("/", index)
@@ -85,13 +81,11 @@ def test_expired_session():
 
 
 def test_exploding_middleware():
-    _, environ, start_response = setup()
+    app, environ, start_response = setup(
-    app = SpiderwebRouter(
         middleware=[
             "spiderweb.tests.middleware.ExplodingRequestMiddleware",
             "spiderweb.tests.middleware.ExplodingResponseMiddleware",
         ],
-        db=SqliteDatabase("spiderweb-tests.db"),
     )
 
     app.add_route("/", index)
@@ -102,7 +96,6 @@ def test_exploding_middleware():
 
 
 def test_csrf_middleware_without_session_middleware():
-    _, environ, start_response = setup()
     with pytest.raises(StartupErrors) as e:
         SpiderwebRouter(
             middleware=["spiderweb.middleware.csrf.CSRFMiddleware"],
@@ -116,15 +109,14 @@ def test_csrf_middleware_without_session_middleware():
 
 
 def test_csrf_middleware_above_session_middleware():
-    _, environ, start_response = setup()
     with pytest.raises(StartupErrors) as e:
-        SpiderwebRouter(
+        app, environ, start_response = setup(
             middleware=[
                 "spiderweb.middleware.csrf.CSRFMiddleware",
                 "spiderweb.middleware.sessions.SessionMiddleware",
             ],
-            db=SqliteDatabase("spiderweb-tests.db"),
         )
+
     exceptiongroup = e.value.args[1]
     assert (
         exceptiongroup[0].args[0]
@@ -133,13 +125,11 @@ def test_csrf_middleware_above_session_middleware():
 
 
 def test_csrf_middleware():
-    _, environ, start_response = setup()
+    app, environ, start_response = setup(
-    app = SpiderwebRouter(
         middleware=[
             "spiderweb.middleware.sessions.SessionMiddleware",
             "spiderweb.middleware.csrf.CSRFMiddleware",
         ],
-        db=SqliteDatabase("spiderweb-tests.db"),
     )
 
     app.add_route("/", form_view_with_csrf, ["GET", "POST"])
@@ -198,14 +188,13 @@ def test_csrf_middleware():
 
 
 def test_csrf_expired_token():
-    _, environ, start_response = setup()
+    app, environ, start_response = setup(
-    app = SpiderwebRouter(
         middleware=[
             "spiderweb.middleware.sessions.SessionMiddleware",
             "spiderweb.middleware.csrf.CSRFMiddleware",
         ],
-        db=SqliteDatabase("spiderweb-tests.db"),
     )
+
     app.middleware[1].CSRF_EXPIRY = -1
 
     app.add_route("/", form_view_with_csrf, ["GET", "POST"])
@@ -235,13 +224,11 @@ def test_csrf_expired_token():
 
 
 def test_csrf_exempt():
-    _, environ, start_response = setup()
+    app, environ, start_response = setup(
-    app = SpiderwebRouter(
         middleware=[
             "spiderweb.middleware.sessions.SessionMiddleware",
             "spiderweb.middleware.csrf.CSRFMiddleware",
         ],
-        db=SqliteDatabase("spiderweb-tests.db"),
     )
 
     app.add_route("/", form_csrf_exempt, ["GET", "POST"])
@@ -268,8 +255,7 @@ def test_csrf_exempt():
 
 
 def test_csrf_trusted_origins():
-    _, environ, start_response = setup()
+    app, environ, start_response = setup(
-    app = SpiderwebRouter(
         middleware=[
             "spiderweb.middleware.sessions.SessionMiddleware",
             "spiderweb.middleware.csrf.CSRFMiddleware",
@@ -277,9 +263,7 @@ def test_csrf_trusted_origins():
         csrf_trusted_origins=[
             "example.com",
         ],
-        db=SqliteDatabase("spiderweb-tests.db"),
     )
-
     app.add_route("/", form_view_without_csrf, ["GET", "POST"])
 
     environ["HTTP_USER_AGENT"] = "hi"

spiderweb/tests/test_responses.py

@@ -75,15 +75,13 @@ def test_redirect_response():
 
 
 def test_add_route_at_server_start():
-    app, environ, start_response = setup()
-
     def index(request):
         return RedirectResponse(location="/redirected")
 
     def view2(request):
         return HttpResponse("View 2")
 
-    app = SpiderwebRouter(
+    app, environ, start_response = setup(
         routes=[
             ("/", index, {"allowed_methods": ["GET", "POST"], "csrf_exempt": True}),
             ("/view2", view2),
@@ -95,8 +93,7 @@ def test_add_route_at_server_start():
 
 
 def test_redirect_on_append_slash():
-    _, environ, start_response = setup()
+    app, environ, start_response = setup(append_slash=True)
-    app = SpiderwebRouter(append_slash=True)
 
     @app.route("/hello")
     def index(request):
@@ -109,9 +106,7 @@ def test_redirect_on_append_slash():
 
 @given(st.text())
 def test_template_response_with_template(text):
-    _, environ, start_response = setup()
+    app, environ, start_response = setup(templates_dirs=["spiderweb/tests"])
-
-    app = SpiderwebRouter(templates_dirs=["spiderweb/tests"])
 
     @app.route("/")
     def index(request):
@@ -174,11 +169,10 @@ def test_duplicate_error_view():
 
 
 def test_missing_view_with_custom_404_alt():
-    _, environ, start_response = setup()
 
     def custom_404(request):
         return HttpResponse("Custom 404 2")
 
-    app = SpiderwebRouter(error_routes={404: custom_404})
+    app, environ, start_response = setup(error_routes={404: custom_404})
 
     assert app(environ, start_response) == [b"Custom 404 2"]