FlaskTester 4.2__tar.gz → 4.3__tar.gz

{flasktester-4.2 → flasktester-4.3}/FlaskTester.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: FlaskTester
-Version: 4.2
+Version: 4.3
 Summary: Pytest fixtures for Flask internal and external authenticated tests
 Author-email: Fabien Coelho <flask.tester@coelho.net>
 License: CC0
@@ -19,7 +19,6 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests
-Requires-Dist: flask
 Requires-Dist: pytest
 Provides-Extra: dev
 Requires-Dist: mypy; extra == "dev"
@@ -34,6 +33,7 @@ Requires-Dist: types-flask; extra == "dev"
 Requires-Dist: types-requests; extra == "dev"
 Requires-Dist: FlaskSimpleAuth>=30.0; extra == "dev"
 Requires-Dist: passlib; extra == "dev"
+Requires-Dist: bcrypt; extra == "dev"
 Requires-Dist: pydantic; extra == "dev"
 Provides-Extra: doc
 Requires-Dist: sphinx; extra == "doc"

{flasktester-4.2 → flasktester-4.3}/FlaskTester.egg-info/requires.txt

@@ -1,5 +1,4 @@
 requests
-flask
 pytest
 
 [dev]
@@ -15,6 +14,7 @@ types-flask
 types-requests
 FlaskSimpleAuth>=30.0
 passlib
+bcrypt
 pydantic
 
 [doc]

{flasktester-4.2 → flasktester-4.3}/FlaskTester.py

@@ -348,11 +348,13 @@ class Client:
             cookies.update(kwargs["cookies"])
             del kwargs["cookies"]
 
-        # FIXME allow or forbid?
-        # if "json" in kwargs and "data" in kwargs:
-        #     log.warning("mix of json and data parameters in request")
+        # this is forbidden by Flask client
+        if "json" in kwargs and "data" in kwargs:
+            # merge into data to possibly keep uploads
+            kwargs["data"].update(kwargs["json"])
+            del kwargs["json"]
 
-        # convert json parameters
+        # convert json parameters to json
         if "json" in kwargs:
             json_param = kwargs["json"]
             assert isinstance(json_param, dict)
@@ -368,7 +370,7 @@ class Client:
                 else: # pydantic or standard dataclasses?
                     json_param[name] = dataclasses.asdict(val)
 
-        # convert data parameters
+        # convert data parameters to simple strings
         if "data" in kwargs:
             data_param = kwargs["data"]
             assert isinstance(data_param, dict)
@@ -388,6 +390,7 @@ class Client:
                 else:
                     data_param[name] = json.dumps(dataclasses.asdict(val))
 
+        # now set authentication headers and do the query
         self._auth.setAuth(login, kwargs, cookies, auth=auth)
         res = self._request(method, path, cookies, **kwargs)  # type: ignore
 
@@ -530,6 +533,7 @@ def _ft_authenticator():
     auth = Authenticator(allow, user=user, pwd=pwd, login=login, bearer=bearer,
                          header=header, cookie=cookie, tparam=tparam, ptype=ptype)
 
+    # possibly load credentials from the environment
     if "FLASK_TESTER_AUTH" in os.environ:
         auth.setPasses(os.environ["FLASK_TESTER_AUTH"].split(","))
 

{flasktester-4.2 → flasktester-4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: FlaskTester
-Version: 4.2
+Version: 4.3
 Summary: Pytest fixtures for Flask internal and external authenticated tests
 Author-email: Fabien Coelho <flask.tester@coelho.net>
 License: CC0
@@ -19,7 +19,6 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests
-Requires-Dist: flask
 Requires-Dist: pytest
 Provides-Extra: dev
 Requires-Dist: mypy; extra == "dev"
@@ -34,6 +33,7 @@ Requires-Dist: types-flask; extra == "dev"
 Requires-Dist: types-requests; extra == "dev"
 Requires-Dist: FlaskSimpleAuth>=30.0; extra == "dev"
 Requires-Dist: passlib; extra == "dev"
+Requires-Dist: bcrypt; extra == "dev"
 Requires-Dist: pydantic; extra == "dev"
 Provides-Extra: doc
 Requires-Dist: sphinx; extra == "doc"

{flasktester-4.2 → flasktester-4.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "FlaskTester"
-version = "4.2"
+version = "4.3"
 authors = [ { name = "Fabien Coelho", email = "flask.tester@coelho.net" } ]
 description = "Pytest fixtures for Flask internal and external authenticated tests"
 readme = "README.md"
@@ -12,7 +12,6 @@ license = { text = "CC0" }
 requires-python = ">=3.10"
 dependencies = [
   "requests",
-  "flask",
   "pytest"
 ]
 classifiers = [
@@ -39,7 +38,7 @@ dev = [
   # packaging
   "build", "twine", "wheel",
   # tests
-  "types-flask", "types-requests", "FlaskSimpleAuth>=30.0", "passlib", "pydantic"
+  "types-flask", "types-requests", "FlaskSimpleAuth>=30.0", "passlib", "bcrypt", "pydantic"
 ]
 # documentation generation
 doc = ["sphinx", "sphinx_rtd_theme", "sphinx-autoapi", "sphinx-lint", "myst_parser"]

{flasktester-4.2 → flasktester-4.3}/tests/test_app.py

@@ -65,15 +65,15 @@ def test_app_who_am_i(app):  # GET /who-am-i
 def api(ft_client):
     # set a default
     ft_client._default_login = "calvin"
-    # bad password / token
+    # bad password and token
     ft_client.setPass("moe", None)
     ft_client.setToken("moe", None)
     ft_client.setPass("moe", "bad password")
     ft_client.setToken("moe", "bad token")
-    # cookies
+    # set language cookies
     ft_client.setCookie("calvin", "lang", "en")
     ft_client.setCookie("hobbes", "lang", "fr")
-    # get valid tokens using password authn
+    # get valid tokens using password authn on /login
     res = ft_client.get("/login", login="calvin", auth="basic", status=200)
     assert res.json["user"] == "calvin"
     ft_client._auth.setToken("calvin", res.json["token"])
@@ -100,7 +100,7 @@ def api(ft_client):
     assert res.json["user"] == "calvin"
     res = ft_client.get("/who-am-i", status=200)
     assert res.json["user"] == "calvin"
-    # add a bad password
+    # ready for testing routes
     yield ft_client
 
 def test_admin(api):

{flasktester-4.2 → flasktester-4.3}/tests/test_app2.py

@@ -26,3 +26,12 @@ def test_something(app):
     app.get("/open", 200, "Hello", login="calvin", auth="none")
     app.get("/open", 200, "Bonjour", login="hobbes", auth="none")
     app.get("/open", 200, "Guten Tag", login=None)
+
+def test_params(app):
+    res = app.get("/add", 200, data={"i": 39, "j": 3}, login=None)
+    assert res.is_json and res.json["sum"] == 42
+    res = app.get("/add", 200, json={"i": 35, "j": 7}, login=None)
+    assert res.is_json and res.json["sum"] == 42
+    # mixing data/json is okay for FlaskTester
+    res = app.get("/add", 200, data={"i": 30}, json={"j": 12}, login=None)
+    assert res.is_json and res.json["sum"] == 42