remove boilerplate target url fix
This commit is contained in:
+11
-9
@@ -28,22 +28,20 @@ class MySession(requests_async.AsyncSession):
|
||||
return await super().request(method, url, **kwargs)
|
||||
|
||||
@pytest_asyncio.fixture(scope="function")
|
||||
async def auth_fixture():
|
||||
async def auth_fixture(target_url:str):
|
||||
|
||||
payload = {"username": e2e_settings.TEST_USERNAME, "password": e2e_settings.TEST_PASSWORD}
|
||||
url = f'http://{e2e_settings.HOST}:{e2e_settings.PORT}'
|
||||
|
||||
async with MySession() as session:
|
||||
response = await session.post(url + "/protected/token", data=payload)
|
||||
response = await session.post(target_url + "/protected/token", data=payload)
|
||||
response.raise_for_status()
|
||||
session.token = response.json()["access_token"]
|
||||
yield session
|
||||
|
||||
|
||||
@pytest_asyncio.fixture(scope="function")
|
||||
async def test_user_fixture(request, auth_fixture: MySession):
|
||||
async def test_user_fixture(request, auth_fixture: MySession, target_url:str):
|
||||
|
||||
url=f"http://{e2e_settings.HOST}:{e2e_settings.PORT}"
|
||||
test_id=uuid4()
|
||||
|
||||
direct_permission_param, group_param = request.param
|
||||
@@ -57,7 +55,7 @@ async def test_user_fixture(request, auth_fixture: MySession):
|
||||
"direct_permissions":direct_permission_param,
|
||||
"group":group_param
|
||||
}
|
||||
response=await auth_fixture.post(f"{url}/user/create_user", json=new_user_record)
|
||||
response=await auth_fixture.post(f"{target_url}/user/create_user", json=new_user_record)
|
||||
response.raise_for_status()
|
||||
|
||||
|
||||
@@ -65,11 +63,15 @@ async def test_user_fixture(request, auth_fixture: MySession):
|
||||
|
||||
payload={"username": new_user_record.get("email"), "password": new_user_record.get("plain_password")}
|
||||
|
||||
response = await session.post(url + "/protected/token", data=payload)
|
||||
response = await session.post(target_url + "/protected/token", data=payload)
|
||||
response.raise_for_status()
|
||||
session.token = response.json()["access_token"]
|
||||
|
||||
yield (session, new_user_record)
|
||||
|
||||
response=await auth_fixture.post(f"{url}/user/delete_user_hard", params={"email":new_user_record.get("email")})
|
||||
response.raise_for_status()
|
||||
response=await auth_fixture.post(f"{target_url}/user/delete_user_hard", params={"email":new_user_record.get("email")})
|
||||
response.raise_for_status()
|
||||
|
||||
@pytest_asyncio.fixture()
|
||||
async def target_url()->str:
|
||||
return f"http://{e2e_settings.HOST}:{e2e_settings.PORT}"
|
||||
Reference in New Issue
Block a user