mirror of
https://github.com/aljazceru/CTFd.git
synced 2025-12-17 22:14:25 +01:00
Format all the things (#991)
* Format Javascript and CSS files with `prettier`: `prettier --write 'CTFd/themes/**/*'` * Format Python with `black`: `black CTFd` & `black tests` * Travis now uses xenial instead of trusty.
This commit is contained in:
@@ -6,7 +6,7 @@ from tests.helpers import (
|
||||
destroy_ctfd,
|
||||
login_as_user,
|
||||
gen_challenge,
|
||||
gen_flag
|
||||
gen_flag,
|
||||
)
|
||||
|
||||
|
||||
@@ -19,32 +19,32 @@ def test_api_flags_get_non_admin():
|
||||
with app.test_client() as client:
|
||||
# test_api_flags_get_non_admin
|
||||
"""Can a user get /api/v1/flags if not admin"""
|
||||
r = client.get('/api/v1/flags', json="")
|
||||
r = client.get("/api/v1/flags", json="")
|
||||
assert r.status_code == 403
|
||||
|
||||
# test_api_flags_post_non_admin
|
||||
"""Can a user post /api/v1/flags if not admin"""
|
||||
r = client.post('/api/v1/flags')
|
||||
r = client.post("/api/v1/flags")
|
||||
assert r.status_code == 403
|
||||
|
||||
# test_api_flag_types_get_non_admin
|
||||
"""Can a user get /api/v1/flags/types[/<type_name>] if not admin"""
|
||||
r = client.get('/api/v1/flags/types', json="")
|
||||
r = client.get("/api/v1/flags/types", json="")
|
||||
assert r.status_code == 403
|
||||
|
||||
# test_api_flag_get_non_admin
|
||||
"""Can a user get /api/v1/flags/<flag_id> if not admin"""
|
||||
r = client.get('/api/v1/flags/1', json="")
|
||||
r = client.get("/api/v1/flags/1", json="")
|
||||
assert r.status_code == 403
|
||||
|
||||
# test_api_flag_patch_non_admin
|
||||
"""Can a user patch /api/v1/flags/<flag_id> if not admin"""
|
||||
r = client.patch('/api/v1/flags/1', json="")
|
||||
r = client.patch("/api/v1/flags/1", json="")
|
||||
assert r.status_code == 403
|
||||
|
||||
# test_api_flag_delete_non_admin
|
||||
"""Can a user delete /api/v1/flags/<flag_id> if not admin"""
|
||||
r = client.delete('/api/v1/flags/1', json="")
|
||||
r = client.delete("/api/v1/flags/1", json="")
|
||||
assert r.status_code == 403
|
||||
destroy_ctfd(app)
|
||||
|
||||
@@ -53,8 +53,8 @@ def test_api_flags_get_admin():
|
||||
"""Can a user get /api/v1/flags if admin"""
|
||||
app = create_ctfd()
|
||||
with app.app_context():
|
||||
with login_as_user(app, 'admin') as client:
|
||||
r = client.get('/api/v1/flags', json="")
|
||||
with login_as_user(app, "admin") as client:
|
||||
r = client.get("/api/v1/flags", json="")
|
||||
assert r.status_code == 200
|
||||
destroy_ctfd(app)
|
||||
|
||||
@@ -65,9 +65,10 @@ def test_api_flags_post_admin():
|
||||
with app.app_context():
|
||||
gen_challenge(app.db)
|
||||
with login_as_user(app, name="admin") as client:
|
||||
r = client.post('/api/v1/flags', json={"content": "flag",
|
||||
"type": "static",
|
||||
"challenge": 1})
|
||||
r = client.post(
|
||||
"/api/v1/flags",
|
||||
json={"content": "flag", "type": "static", "challenge": 1},
|
||||
)
|
||||
assert r.status_code == 200
|
||||
destroy_ctfd(app)
|
||||
|
||||
@@ -76,10 +77,10 @@ def test_api_flag_types_get_admin():
|
||||
"""Can a user get /api/v1/flags/types[/<type_name>] if admin"""
|
||||
app = create_ctfd()
|
||||
with app.app_context():
|
||||
with login_as_user(app, 'admin') as client:
|
||||
r = client.get('/api/v1/flags/types', json="")
|
||||
with login_as_user(app, "admin") as client:
|
||||
r = client.get("/api/v1/flags/types", json="")
|
||||
assert r.status_code == 200
|
||||
r = client.get('/api/v1/flags/types/static', json="")
|
||||
r = client.get("/api/v1/flags/types/static", json="")
|
||||
assert r.status_code == 200
|
||||
destroy_ctfd(app)
|
||||
|
||||
@@ -90,8 +91,8 @@ def test_api_flag_get_admin():
|
||||
with app.app_context():
|
||||
gen_challenge(app.db)
|
||||
gen_flag(app.db, 1)
|
||||
with login_as_user(app, 'admin') as client:
|
||||
r = client.get('/api/v1/flags/1', json="")
|
||||
with login_as_user(app, "admin") as client:
|
||||
r = client.get("/api/v1/flags/1", json="")
|
||||
assert r.status_code == 200
|
||||
destroy_ctfd(app)
|
||||
|
||||
@@ -102,14 +103,13 @@ def test_api_flag_patch_admin():
|
||||
with app.app_context():
|
||||
gen_challenge(app.db)
|
||||
gen_flag(app.db, 1)
|
||||
with login_as_user(app, 'admin') as client:
|
||||
r = client.patch('/api/v1/flags/1', json={
|
||||
"content": "flag_edit",
|
||||
"data": "",
|
||||
"type": "static",
|
||||
"id": "1"})
|
||||
with login_as_user(app, "admin") as client:
|
||||
r = client.patch(
|
||||
"/api/v1/flags/1",
|
||||
json={"content": "flag_edit", "data": "", "type": "static", "id": "1"},
|
||||
)
|
||||
assert r.status_code == 200
|
||||
assert r.get_json()['data']['content'] == "flag_edit"
|
||||
assert r.get_json()["data"]["content"] == "flag_edit"
|
||||
destroy_ctfd(app)
|
||||
|
||||
|
||||
@@ -119,8 +119,8 @@ def test_api_flag_delete_admin():
|
||||
with app.app_context():
|
||||
gen_challenge(app.db)
|
||||
gen_flag(app.db, 1)
|
||||
with login_as_user(app, 'admin') as client:
|
||||
r = client.delete('/api/v1/flags/1', json="")
|
||||
with login_as_user(app, "admin") as client:
|
||||
r = client.delete("/api/v1/flags/1", json="")
|
||||
assert r.status_code == 200
|
||||
assert r.get_json().get('data') is None
|
||||
assert r.get_json().get("data") is None
|
||||
destroy_ctfd(app)
|
||||
|
||||
Reference in New Issue
Block a user