chore: remove unneeded formatted strings in tests

HEYGUL · HEYGUL · commit 12324b1e6826 · 2023-01-16T22:00:51.000-05:00
diff --git a/backend/tests/api/test_admin_structures.py b/backend/tests/api/test_admin_structures.py
@@ -29,7 +29,7 @@ async def test_jwt_token_verification(
             },
             "structure_id": str(structure_id_pe_livry),
         },
-        headers={"jwt-token": f"{get_professional_jwt}"},
+        headers={"jwt-token": get_professional_jwt},
     )
 
     json = response.json()
@@ -61,7 +61,7 @@ async def test_insert_admin_structure_with_structure_in_db(
             },
             "structure_id": str(structure_id_pe_livry),
         },
-        headers={"jwt-token": f"{get_admin_structure_jwt}"},
+        headers={"jwt-token": get_admin_structure_jwt},
     )
 
     assert response.status_code == 200
@@ -116,7 +116,7 @@ async def test_insert_existing_admin_structure_in_structure_in_db(
             },
             "structure_id": str(structure_id_pe_livry),
         },
-        headers={"jwt-token": f"{get_admin_structure_jwt}"},
+        headers={"jwt-token": get_admin_structure_jwt},
     )
 
     assert response.status_code == 200
@@ -163,7 +163,7 @@ async def test_insert_existing_admin_structure_in_existing_structure(
             },
             "structure_id": str(structure_id_pe_livry),
         },
-        headers={"jwt-token": f"{get_admin_structure_jwt}"},
+        headers={"jwt-token": get_admin_structure_jwt},
     )
 
     assert response.status_code == 200
@@ -204,7 +204,7 @@ async def test_insert_deleted_admin_structure_in_structure_in_db(
             },
             "structure_id": str(structure_id_pe_livry),
         },
-        headers={"jwt-token": f"{get_admin_structure_jwt}"},
+        headers={"jwt-token": get_admin_structure_jwt},
     )
 
     assert response.status_code == 200
diff --git a/backend/tests/api/test_csv2json.py b/backend/tests/api/test_csv2json.py
@@ -7,7 +7,7 @@ async def test_parse_csv(
         response = test_client.post(
             "/v1/convert-file/beneficiaries",
             files={"upload_file": ("filename", file, "text/csv")},
-            headers={"jwt-token": f"{get_manager_jwt}"},
+            headers={"jwt-token": get_manager_jwt},
         )
 
         assert response.status_code == 200
@@ -25,7 +25,7 @@ async def test_parse_csv_with_all_date_formats(
         response = test_client.post(
             "/v1/convert-file/beneficiaries",
             files={"upload_file": ("filename", file, "text/csv")},
-            headers={"jwt-token": f"{get_manager_jwt}"},
+            headers={"jwt-token": get_manager_jwt},
         )
 
         assert response.json()[0]["data"]["Identifiant dans le SI*"] == "1234"
@@ -42,7 +42,7 @@ async def test_parse_csv_errors(
         response = test_client.post(
             "/v1/convert-file/beneficiaries",
             files={"upload_file": ("filename", file, "text/csv")},
-            headers={"jwt-token": f"{get_manager_jwt}"},
+            headers={"jwt-token": get_manager_jwt},
         )
 
         assert response.json()[0]["errors"][0]["key"] == "Date de naissance*"
@@ -66,7 +66,7 @@ async def test_structure_parse_csv(
         response = test_client.post(
             "/v1/convert-file/structures",
             files={"upload_file": ("filename", file, "text/csv")},
-            headers={"jwt-token": f"{get_manager_jwt}"},
+            headers={"jwt-token": get_manager_jwt},
         )
 
         assert response.status_code == 200
@@ -81,7 +81,7 @@ async def test_structure_parse_csv_with_error(
         response = test_client.post(
             "/v1/convert-file/structures",
             files={"upload_file": ("filename", file, "text/csv")},
-            headers={"jwt-token": f"{get_manager_jwt}"},
+            headers={"jwt-token": get_manager_jwt},
         )
         data = response.json()
 
@@ -143,7 +143,7 @@ async def test_structure_parse_csv_with_missing_column_should_not_fail(
         response = test_client.post(
             "/v1/convert-file/structures",
             files={"upload_file": ("filename", file, "text/csv")},
-            headers={"jwt-token": f"{get_manager_jwt}"},
+            headers={"jwt-token": get_manager_jwt},
         )
         data = response.json()
 
diff --git a/backend/tests/api/test_import_beneficiaries.py b/backend/tests/api/test_import_beneficiaries.py
@@ -19,7 +19,7 @@ async def import_beneficiaries(
 ):
     return client.post(
         "/v1/beneficiaries/bulk",
-        headers={"jwt-token": f"{token}"},
+        headers={"jwt-token": token},
         data=json.dumps(
             {
                 "need_orientation": True,
@@ -36,7 +36,7 @@ async def test_import_beneficiaries_must_be_done_by_a_manager(
 ):
     response = test_client.post(
         "/v1/beneficiaries/bulk",
-        headers={"jwt-token": f"{get_professional_jwt}"},
+        headers={"jwt-token": get_professional_jwt},
         data=json.dumps(
             {
                 "beneficiaries": [],
diff --git a/backend/tests/api/test_managers.py b/backend/tests/api/test_managers.py
@@ -20,7 +20,7 @@ async def test_jwt_token_verification(
     response = test_client.post(
         ENDPOINT_PATH,
         json={"email": sender_email, "firstname": "lionel", "lastname": "Bé"},
-        headers={"jwt-token": f"{get_admin_structure_jwt}"},
+        headers={"jwt-token": get_admin_structure_jwt},
     )
 
     json = response.json()
@@ -46,7 +46,7 @@ async def test_insert_admin_in_db(
             "lastname": "Bé",
             "deployment_id": str(deployment_id_cd93),
         },
-        headers={"jwt-token": f"{get_admin_cdb_jwt}"},
+        headers={"jwt-token": get_admin_cdb_jwt},
     )
     admins = await get_managers_from_deployment(db_connection, deployment_id_cd93)
 
diff --git a/backend/tests/api/test_notebooks.py b/backend/tests/api/test_notebooks.py
@@ -33,7 +33,7 @@ async def test_orientation_manager_not_allowed_to_add_notebook_member(
 ):
     response = test_client.post(
         f"/v1/notebooks/{str(notebook_sophie_tifour.id)}/members",
-        headers={"jwt-token": f"{giulia_diaby_jwt}"},
+        headers={"jwt-token": giulia_diaby_jwt},
     )
     assert response.status_code == 403
     json = response.json()
@@ -53,7 +53,7 @@ async def test_add_notebook_member_as_no_referent(
     response = test_client.post(
         f"/v1/notebooks/{str(notebook_sophie_tifour.id)}/members",
         json={"member_type": "no_referent"},
-        headers={"jwt-token": f"{get_professional_paul_camara_jwt}"},
+        headers={"jwt-token": get_professional_paul_camara_jwt},
     )
     assert response.status_code == 204
     members = await get_notebook_members_by_notebook_id(
@@ -83,7 +83,7 @@ async def test_add_notebook_member_as_referent(
     response = test_client.post(
         f"/v1/notebooks/{str(notebook_sophie_tifour.id)}/members",
         json={"member_type": "referent"},
-        headers={"jwt-token": f"{get_professional_paul_camara_jwt}"},
+        headers={"jwt-token": get_professional_paul_camara_jwt},
     )
     assert response.status_code == 204
     members = await get_notebook_members_by_notebook_id(
diff --git a/backend/tests/api/test_orientation_requests.py b/backend/tests/api/test_orientation_requests.py
@@ -22,7 +22,7 @@ async def test_deny_orientation_request_email(
         json={
             "orientation_request_id": str(orientation_request_jennings_dee.id),
         },
-        headers={"jwt-token": f"{giulia_diaby_jwt}"},
+        headers={"jwt-token": giulia_diaby_jwt},
     )
     print(response.json())
     assert response.status_code == 200
diff --git a/backend/tests/api/test_orientations.py b/backend/tests/api/test_orientations.py
@@ -53,7 +53,7 @@ async def test_professional_not_allowed_to_change_orientation(
             "structure_id": str(professional_pierre_chevalier.structure_id),
             "new_referent_account_id": str(professional_pierre_chevalier.account_id),
         },
-        headers={"jwt-token": f"{get_professional_jwt}"},
+        headers={"jwt-token": get_professional_jwt},
     )
     assert response.status_code == 403
     json = response.json()
@@ -76,7 +76,7 @@ async def test_admin_structure_not_allowed_to_change_orientation(
             "structure_id": str(professional_pierre_chevalier.structure_id),
             "new_referent_account_id": str(professional_pierre_chevalier.account_id),
         },
-        headers={"jwt-token": f"{get_admin_structure_jwt}"},
+        headers={"jwt-token": get_admin_structure_jwt},
     )
     assert response.status_code == 403
     json = response.json()
@@ -100,7 +100,7 @@ async def test_change_orientation_while_keeping_same_referent(
             "structure_id": str(professional_pierre_chevalier.structure_id),
             "new_referent_account_id": str(professional_pierre_chevalier.account_id),
         },
-        headers={"jwt-token": f"{giulia_diaby_jwt}"},
+        headers={"jwt-token": giulia_diaby_jwt},
     )
     assert response.status_code == 200
     members = await get_notebook_members_by_notebook_id(
@@ -130,7 +130,7 @@ async def test_change_orientation_assign_to_structure_not_referent(
             "structure_id": str(professional_paul_camara.structure_id),
             "new_referent_account_id": None,
         },
-        headers={"jwt-token": f"{giulia_diaby_jwt}"},
+        headers={"jwt-token": giulia_diaby_jwt},
     )
     assert response.status_code == 200
     members = await get_notebook_members_by_notebook_id(
@@ -187,7 +187,7 @@ async def test_change_orientation_with_new_referent(
             "structure_id": str(professional_paul_camara.structure_id),
             "new_referent_account_id": str(professional_paul_camara.account_id),
         },
-        headers={"jwt-token": f"{giulia_diaby_jwt}"},
+        headers={"jwt-token": giulia_diaby_jwt},
     )
     assert response.status_code == 200
     members = await get_notebook_members_by_notebook_id(
@@ -247,7 +247,7 @@ async def test_change_orientation_with_new_referent_when_beneficiary_has_no_stru
             "structure_id": str(professional_paul_camara.structure_id),
             "new_referent_account_id": str(professional_paul_camara.account_id),
         },
-        headers={"jwt-token": f"{samy_rouate_jwt}"},
+        headers={"jwt-token": samy_rouate_jwt},
     )
     assert response.status_code == 200
     members = await get_notebook_members_by_notebook_id(
@@ -292,7 +292,7 @@ async def test_change_orientation_with_orientation_request(
             "structure_id": str(professional_pierre_chevalier.structure_id),
             "new_referent_account_id": str(professional_pierre_chevalier.account_id),
         },
-        headers={"jwt-token": f"{giulia_diaby_jwt}"},
+        headers={"jwt-token": giulia_diaby_jwt},
     )
 
     orientation_request = await get_orientation_request_by_id(
@@ -327,7 +327,7 @@ async def test_send_email_to_members_with_orientation_request(
             "new_referent_account_id": str(professional_paul_camara.account_id),
             "orientation_request_id": str(orientation_request_jennings_dee.id),
         },
-        headers={"jwt-token": f"{giulia_diaby_jwt}"},
+        headers={"jwt-token": giulia_diaby_jwt},
     )
     assert response.status_code == 200
     assert mock_send_email.call_count == 2
@@ -364,7 +364,7 @@ async def test_send_email_to_members_without_orientation_request(
             "structure_id": str(professional_paul_camara.structure_id),
             "new_referent_account_id": str(professional_paul_camara.account_id),
         },
-        headers={"jwt-token": f"{giulia_diaby_jwt}"},
+        headers={"jwt-token": giulia_diaby_jwt},
     )
     assert response.status_code == 200
     assert mock_send_email.call_count == 2
@@ -400,7 +400,7 @@ async def test_send_email_to_members_first_orientation(
             "structure_id": str(professional_paul_camara.structure_id),
             "new_referent_account_id": str(professional_paul_camara.account_id),
         },
-        headers={"jwt-token": f"{giulia_diaby_jwt}"},
+        headers={"jwt-token": giulia_diaby_jwt},
     )
     assert response.status_code == 200
     assert mock_send_email.call_count == 1
@@ -428,7 +428,7 @@ async def test_unconsistent_orientation_request(
             "structure_id": str(professional_paul_camara.structure_id),
             "orientation_request_id": str(orientation_request_jennings_dee.id),
         },
-        headers={"jwt-token": f"{giulia_diaby_jwt}"},
+        headers={"jwt-token": giulia_diaby_jwt},
     )
 
     assert response.status_code == 400
diff --git a/backend/tests/api/test_structures.py b/backend/tests/api/test_structures.py
@@ -21,7 +21,7 @@ async def test_structure_import_json(
     response = test_client.post(
         ENDPOINT_PATH,
         json={"structures": import_structures_json, "sendAccountEmail": True},
-        headers={"jwt-token": f"{get_manager_jwt}"},
+        headers={"jwt-token": get_manager_jwt},
     )
 
     data = response.json()
@@ -59,7 +59,7 @@ async def test_structure_with_buggy_import_json(
     response = test_client.post(
         ENDPOINT_PATH,
         json={"structures": import_structures_json_with_errors},
-        headers={"jwt-token": f"{get_manager_jwt}"},
+        headers={"jwt-token": get_manager_jwt},
     )
 
     data = response.json()
@@ -77,7 +77,7 @@ async def test_structure_with_fail_structure_insert(
     response = test_client.post(
         ENDPOINT_PATH,
         json={"structures": import_structures_json},
-        headers={"jwt-token": f"{get_manager_jwt}"},
+        headers={"jwt-token": get_manager_jwt},
     )
 
     data = response.json()
@@ -107,7 +107,7 @@ async def test_structure_with_fail_admin_insert(
     response = test_client.post(
         ENDPOINT_PATH,
         json={"structures": import_structures_json},
-        headers={"jwt-token": f"{get_manager_jwt}"},
+        headers={"jwt-token": get_manager_jwt},
     )
 
     data = response.json()
@@ -139,7 +139,7 @@ async def test_structure_with_fail_admin_structure_structure_insert(
     response = test_client.post(
         ENDPOINT_PATH,
         json={"structures": import_structures_json},
-        headers={"jwt-token": f"{get_manager_jwt}"},
+        headers={"jwt-token": get_manager_jwt},
     )
 
     data = response.json()
diff --git a/backend/tests/api/test_uploads.py b/backend/tests/api/test_uploads.py
@@ -20,7 +20,7 @@ async def test_jwt_token_verification(
         response = test_client.post(
             ENDPOINT_PATH,
             files={"upload_file": ("filename", f, "text/plain")},
-            headers={"jwt-token": f"{get_admin_structure_jwt}"},
+            headers={"jwt-token": get_admin_structure_jwt},
         )
 
         json = response.json()
@@ -42,7 +42,7 @@ async def test_insert_in_db(
         test_client.post(
             ENDPOINT_PATH,
             files={"upload_file": ("filename", f, "text/plain")},
-            headers={"jwt-token": f"{get_manager_jwt}"},
+            headers={"jwt-token": get_manager_jwt},
         )
         orientation_managers = await get_orientation_managers(db_connection)
         assert len(orientation_managers) == 5
@@ -76,7 +76,7 @@ async def test_validation_error(
         response = test_client.post(
             ENDPOINT_PATH,
             files={"upload_file": ("filename", f, "text/plain")},
-            headers={"jwt-token": f"{get_manager_jwt}"},
+            headers={"jwt-token": get_manager_jwt},
         )
         json = response.json()
 
@@ -99,7 +99,7 @@ async def test_handle_xls(
         response = test_client.post(
             ENDPOINT_PATH,
             files={"upload_file": ("filename", f, "application/vnd.ms-excel")},
-            headers={"jwt-token": f"{get_manager_jwt}"},
+            headers={"jwt-token": get_manager_jwt},
         )
         assert response.status_code == 200
         json = response.json()
@@ -125,7 +125,7 @@ async def test_handle_xlsx(
                     "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
                 )
             },
-            headers={"jwt-token": f"{get_manager_jwt}"},
+            headers={"jwt-token": get_manager_jwt},
         )
         assert response.status_code == 200
         json = response.json()

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ async def test_deny_orientation_request_email(`
`22`	`22`	`json={`
`23`	`23`	`"orientation_request_id": str(orientation_request_jennings_dee.id),`
`24`	`24`	`},`
`25`		`- headers={"jwt-token": f"{giulia_diaby_jwt}"},`
	`25`	`+ headers={"jwt-token": giulia_diaby_jwt},`
`26`	`26`	`)`
`27`	`27`	`print(response.json())`
`28`	`28`	`assert response.status_code == 200`