From 952061c4bb13f4b30a4044c3ca046152106d614d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Mon, 27 Feb 2023 16:25:36 +0800 Subject: [PATCH] Added the TEST_SERVER constant in testlib.py, for consistency. --- tests/test_utils.py | 15 +++++++-------- tests/testlib.py | 7 +++++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/tests/test_utils.py b/tests/test_utils.py index 3284f4a..2e1c467 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -27,6 +27,7 @@ from accounting.utils.next_uri import append_next, inherit_next, or_next from accounting.utils.pagination import Pagination, DEFAULT_PAGE_SIZE from accounting.utils.query import parse_query_keywords from test_site import create_app +from testlib import TEST_SERVER class NextUriTestCase(unittest.TestCase): @@ -66,9 +67,8 @@ class NextUriTestCase(unittest.TestCase): self.app.add_url_rule("/test-next", view_func=test_next_uri_view, methods=["GET", "POST"]) - client: httpx.Client = httpx.Client(app=self.app, - base_url="https://testserver") - client.headers["Referer"] = "https://testserver" + client: httpx.Client = httpx.Client(app=self.app, base_url=TEST_SERVER) + client.headers["Referer"] = TEST_SERVER csrf_token: str = client.get("/test-csrf").text response: httpx.Response @@ -96,9 +96,8 @@ class NextUriTestCase(unittest.TestCase): self.app.add_url_rule("/test-no-next", view_func=test_no_next_uri_view, methods=["GET", "POST"]) - client: httpx.Client = httpx.Client(app=self.app, - base_url="https://testserver") - client.headers["Referer"] = "https://testserver" + client: httpx.Client = httpx.Client(app=self.app, base_url=TEST_SERVER) + client.headers["Referer"] = TEST_SERVER csrf_token: str = client.get("/test-csrf").text response: httpx.Response @@ -188,8 +187,8 @@ class PaginationTestCase(unittest.TestCase): self.assertEqual(pagination.list, self.params.result) return "" - self.client = httpx.Client(app=self.app, base_url="https://testserver") - self.client.headers["Referer"] = "https://testserver" + self.client = httpx.Client(app=self.app, base_url=TEST_SERVER) + self.client.headers["Referer"] = TEST_SERVER def __test_success(self, query: str, items: range, result: range, is_paged: bool = True, diff --git a/tests/testlib.py b/tests/testlib.py index 3f0a97f..a81ad47 100644 --- a/tests/testlib.py +++ b/tests/testlib.py @@ -23,6 +23,9 @@ from html.parser import HTMLParser import httpx from flask import Flask +TEST_SERVER: str = "https://testserver" +"""The test server URI.""" + def get_client(app: Flask, username: str) -> tuple[httpx.Client, str]: """Returns a user client. @@ -31,8 +34,8 @@ def get_client(app: Flask, username: str) -> tuple[httpx.Client, str]: :param username: The username. :return: A tuple of the client and the CSRF token. """ - client: httpx.Client = httpx.Client(app=app, base_url="https://testserver") - client.headers["Referer"] = "https://testserver" + client: httpx.Client = httpx.Client(app=app, base_url=TEST_SERVER) + client.headers["Referer"] = TEST_SERVER csrf_token: str = get_csrf_token(client, "/login") response: httpx.Response = client.post("/login", data={"csrf_token": csrf_token,