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:
Kevin Chung
2019-05-11 21:09:37 -04:00
committed by GitHub
parent 3d23ece370
commit 6833378c36
201 changed files with 9561 additions and 9107 deletions

View File

@@ -1,11 +1,13 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
from tests.helpers import (create_ctfd,
destroy_ctfd,
login_as_user,
gen_challenge,
gen_page)
from tests.helpers import (
create_ctfd,
destroy_ctfd,
login_as_user,
gen_challenge,
gen_page,
)
def test_api_pages_get_non_admin():
@@ -15,26 +17,26 @@ def test_api_pages_get_non_admin():
with app.test_client() as client:
gen_page(app.db, title="title", route="/route", content="content")
r = client.get('/api/v1/pages', json="")
r = client.get("/api/v1/pages", json="")
assert r.status_code == 403
# test_api_pages_post_non_admin
"""Can a user post /api/v1/pages if not admin"""
r = client.post('/api/v1/pages')
r = client.post("/api/v1/pages")
assert r.status_code == 403
# test_api_page_get_non_admin
"""Can a user get /api/v1/pages/<page_id> if not admin"""
r = client.get('/api/v1/pages/2', json="")
r = client.get("/api/v1/pages/2", json="")
assert r.status_code == 403
# test_api_page_patch_non_admin
r = client.patch('/api/v1/pages/2', json="")
r = client.patch("/api/v1/pages/2", json="")
assert r.status_code == 403
# test_api_page_delete_non_admin
"""Can a user delete /api/v1/pages/<page_id> if not admin"""
r = client.delete('/api/v1/pages/2', json="")
r = client.delete("/api/v1/pages/2", json="")
assert r.status_code == 403
destroy_ctfd(app)
@@ -43,8 +45,8 @@ def test_api_pages_get_admin():
"""Can a user get /api/v1/pages if admin"""
app = create_ctfd()
with app.app_context():
with login_as_user(app, 'admin') as client:
r = client.get('/api/v1/pages', json="")
with login_as_user(app, "admin") as client:
r = client.get("/api/v1/pages", json="")
assert r.status_code == 200
destroy_ctfd(app)
@@ -56,22 +58,22 @@ def test_api_pages_post_admin():
gen_challenge(app.db)
with login_as_user(app, name="admin") as client:
with client.session_transaction() as sess:
nonce = sess.get('nonce')
nonce = sess.get("nonce")
r = client.post(
'/api/v1/pages',
"/api/v1/pages",
json={
"title": "testing_page_title",
"route": "/route",
"content": "testing_page_content",
"nonce": nonce,
"auth_required": False
}
"auth_required": False,
},
)
r = client.get('/')
r = client.get("/")
assert r.status_code == 200
assert "testing_page_title" in r.get_data(as_text=True)
r = client.get('/route')
r = client.get("/route")
assert r.status_code == 200
assert "testing_page_content" in r.get_data(as_text=True)
destroy_ctfd(app)
@@ -82,8 +84,8 @@ def test_api_page_get_admin():
app = create_ctfd()
with app.app_context():
gen_page(app.db, title="title", route="/route", content="content")
with login_as_user(app, 'admin') as client:
r = client.get('/api/v1/pages/2', json="")
with login_as_user(app, "admin") as client:
r = client.get("/api/v1/pages/2", json="")
assert r.status_code == 200
destroy_ctfd(app)
@@ -93,18 +95,22 @@ def test_api_page_patch_admin():
app = create_ctfd()
with app.app_context():
gen_page(app.db, title="title", route="/route", content="content")
with login_as_user(app, 'admin') as client:
with login_as_user(app, "admin") as client:
with client.session_transaction() as sess:
nonce = sess.get('nonce')
r = client.patch('/api/v1/pages/2', json={
"title": "Title",
"route": "/route",
"content": "content_edit",
"id": "2",
"nonce": nonce,
"auth_required": False})
nonce = sess.get("nonce")
r = client.patch(
"/api/v1/pages/2",
json={
"title": "Title",
"route": "/route",
"content": "content_edit",
"id": "2",
"nonce": nonce,
"auth_required": False,
},
)
assert r.status_code == 200
assert r.get_json()['data']['content'] == "content_edit"
assert r.get_json()["data"]["content"] == "content_edit"
destroy_ctfd(app)
@@ -113,8 +119,8 @@ def test_api_page_delete_admin():
app = create_ctfd()
with app.app_context():
gen_page(app.db, title="title", route="/route", content="content")
with login_as_user(app, 'admin') as client:
r = client.delete('/api/v1/pages/2', json="")
with login_as_user(app, "admin") as client:
r = client.delete("/api/v1/pages/2", 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)