Merge pull request #464 from MongoEngine/tests-fstrings

Replace strings interpolation with f-strings in project tests

tests/test_basic_app.py

@@ -27,12 +27,12 @@ def show(id):
 def test_with_id(app, todo):
     Todo = todo
     client = app.test_client()
-    response = client.get("/show/%s/" % ObjectId())
+    response = client.get(f"/show/{ObjectId()}/")
     assert response.status_code == 404
 
     client.post("/add", data={"title": "First Item", "text": "The text"})
 
-    response = client.get("/show/%s/" % Todo.objects.first_or_404().id)
+    response = client.get(f"/show/{Todo.objects.first_or_404().id}/")
     assert response.status_code == 200
     assert response.data.decode("utf-8") == "First Item\nThe text"
 

tests/test_forms.py

@@ -65,21 +65,19 @@ class Email(db.Document):
 
         EmailForm = model_form(Email)
         form = EmailForm(instance=Email())
-        assert "None" not in "%s" % form.email
+        assert "None" not in f"{form.email}"
         assert form.validate()
 
         form = EmailForm(MultiDict({"email": ""}))
-        assert "None" not in "%s" % form.email
+        assert "None" not in f"{form.email}"
         assert form.validate()
 
-        # Ensure required works
-
         class Email(db.Document):
             email = db.EmailField(required=True)
 
         EmailForm = model_form(Email)
         form = EmailForm(MultiDict({"email": ""}))
-        assert "None" not in "%s" % form.email
+        assert "None" not in f"{form.email}"
         assert not form.validate()
 
 

tests/test_json_app.py

@@ -26,13 +26,13 @@ def show(id):
 def test_with_id(app, todo):
     Todo = todo
     client = app.test_client()
-    response = client.get("/show/%s/" % ObjectId())
+    response = client.get(f"/show/{ObjectId()}/")
     assert response.status_code == 404
 
     response = client.post("/add", data={"title": "First Item", "text": "The text"})
     assert response.status_code == 200
 
-    response = client.get("/show/%s/" % Todo.objects.first().id)
+    response = client.get(f"/show/{Todo.objects.first().id}/")
     assert response.status_code == 200
 
     result = flask.json.loads(response.data).get("result")

tests/test_pagination.py

@@ -7,7 +7,7 @@
 def test_queryset_paginator(app, todo):
     Todo = todo
     for i in range(42):
-        Todo(title="post: %s" % i).save()
+        Todo(title=f"post: {i}").save()
 
     with pytest.raises(NotFound):
         Pagination(iterable=Todo.objects, page=0, per_page=10)
@@ -33,7 +33,7 @@ def test_paginate_plain_list():
 def test_list_field_pagination(app, todo):
     Todo = todo
 
-    comments = ["comment: %s" % i for i in range(42)]
+    comments = [f"comment: {i}" for i in range(42)]
     todo = Todo(
         title="todo has comments",
         comments=comments,

tests/test_session.py

@@ -17,7 +17,7 @@ def index():
 
     @app.route("/check-session")
     def check_session():
-        return "session: %s" % session["a"]
+        return f'session: {session["a"]}'
 
 
 @pytest.fixture