aiolabs/lnbits
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

increase readability by using f-strings (#1597)

Browse source 
* increase readability by using f-strings

* readd merge conflict stuff

---------

Co-authored-by: calle <93376500+callebtc@users.noreply.github.com>
This commit is contained in:
Pavol Rusnak 2023-04-03 15:34:17 +02:00 • committed by GitHub
parent 58c3b05e29
commit 689c443d72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 33 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

70
tests/core/views/test_generic.py
View file

@ -4,27 +4,22 @@ import pytest
@pytest.mark.asyncio
async def test_core_views_generic(client):
response = await client.get("/")
assert response.status_code == 200, (
str(response.url) + " " + str(response.status_code)
)
assert response.status_code == 200, f"{response.url} {response.status_code}"
# check GET /wallet: wallet info
@pytest.mark.asyncio
async def test_get_wallet(client):
response = await client.get("wallet")
assert response.status_code == 307, ( # redirect not modified
str(response.url) + " " + str(response.status_code)
)
# redirect not modified
assert response.status_code == 307, f"{response.url} {response.status_code}"
# check GET /wallet: do not allow redirects, expect code 307
@pytest.mark.asyncio
async def test_get_wallet_no_redirect(client):
response = await client.get("wallet", follow_redirects=False)
assert response.status_code == 307, (
str(response.url) + " " + str(response.status_code)
)
assert response.status_code == 307, f"{response.url} {response.status_code}"
# determine the next redirect location
request = client.build_request("GET", "wallet")
@ -33,13 +28,11 @@ async def test_get_wallet_no_redirect(client):
response = await client.send(request)
request = response.next_request
if i == 0:
assert response.status_code == 307, ( # first redirect
str(response.url) + " " + str(response.status_code)
)
# first redirect
assert response.status_code == 307, f"{response.url} {response.status_code}"
elif i == 1:
assert response.status_code == 200, ( # then get the actual page
str(response.url) + " " + str(response.status_code)
)
# then get the actual page
assert response.status_code == 200, f"{response.url} {response.status_code}"
i += 1
@ -47,18 +40,14 @@ async def test_get_wallet_no_redirect(client):
@pytest.mark.asyncio
async def test_get_wallet_with_nonexistent_user(client):
response = await client.get("wallet", params={"usr": "1"})
assert response.status_code == 400, (
str(response.url) + " " + str(response.status_code)
)
assert response.status_code == 400, f"{response.url} {response.status_code}"
# check GET /wallet: with user
@pytest.mark.asyncio
async def test_get_wallet_with_user(client, to_user):
response = await client.get("wallet", params={"usr": to_user.id})
assert response.status_code == 307, (
str(response.url) + " " + str(response.status_code)
)
assert response.status_code == 307, f"{response.url} {response.status_code}"
# determine the next redirect location
request = client.build_request("GET", "wallet", params={"usr": to_user.id})
@ -67,13 +56,11 @@ async def test_get_wallet_with_user(client, to_user):
response = await client.send(request)
request = response.next_request
if i == 0:
assert response.status_code == 307, ( # first redirect
str(response.url) + " " + str(response.status_code)
)
# first redirect
assert response.status_code == 307, f"{response.url} {response.status_code}"
elif i == 1:
assert response.status_code == 200, ( # then get the actual page
str(response.url) + " " + str(response.status_code)
)
# then get the actual page
assert response.status_code == 200, f"{response.url} {response.status_code}"
i += 1
@ -83,45 +70,36 @@ async def test_get_wallet_with_user_and_wallet(client, to_user, to_wallet):
response = await client.get(
"wallet", params={"usr": to_user.id, "wal": to_wallet.id}
)
assert response.status_code == 200, (
str(response.url) + " " + str(response.status_code)
)
assert response.status_code == 200, f"{response.url} {response.status_code}"
# check GET /wallet: wrong wallet and user, expect 400
@pytest.mark.asyncio
async def test_get_wallet_with_user_and_wrong_wallet(client, to_user):
response = await client.get("wallet", params={"usr": to_user.id, "wal": "1"})
assert response.status_code == 400, (
str(response.url) + " " + str(response.status_code)
)
assert response.status_code == 400, f"{response.url} {response.status_code}"
# check GET /extensions: extensions list
@pytest.mark.asyncio
async def test_get_extensions(client, to_user):
response = await client.get("extensions", params={"usr": to_user.id})
assert response.status_code == 200, (
str(response.url) + " " + str(response.status_code)
)
assert response.status_code == 200, f"{response.url} {response.status_code}"
# check GET /extensions: extensions list wrong user, expect 400
@pytest.mark.asyncio
async def test_get_extensions_wrong_user(client, to_user):
response = await client.get("extensions", params={"usr": "1"})
assert response.status_code == 400, (
str(response.url) + " " + str(response.status_code)
)
assert response.status_code == 400, f"{response.url} {response.status_code}"
# check GET /extensions: no user given, expect code 400 bad request
@pytest.mark.asyncio
async def test_get_extensions_no_user(client):
response = await client.get("extensions")
assert response.status_code == 400, ( # bad request
str(response.url) + " " + str(response.status_code)
)
# bad request
assert response.status_code == 400, f"{response.url} {response.status_code}"
# check GET /extensions: enable extension
@ -132,7 +110,7 @@ async def test_get_extensions_no_user(client):
# "extensions", params={"usr": to_user.id, "enable": "lnurlp"}
# )
# assert response.status_code == 200, (
# str(response.url) + " " + str(response.status_code)
# f"{response.url} {response.status_code}"
# )
@ -144,7 +122,7 @@ async def test_get_extensions_no_user(client):
# params={"usr": to_user.id, "enable": "lnurlp", "disable": "lnurlp"},
# )
# assert response.status_code == 400, (
# str(response.url) + " " + str(response.status_code)
# f"{response.url} {response.status_code}"
# )
@ -154,6 +132,4 @@ async def test_get_extensions_enable_nonexistent_extension(client, to_user):
response = await client.get(
"extensions", params={"usr": to_user.id, "enable": "12341234"}
)
assert response.status_code == 400, (
str(response.url) + " " + str(response.status_code)
)
assert response.status_code == 400, f"{response.url} {response.status_code}"