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

@@ -9,7 +9,7 @@ from tests.helpers import (
login_as_user,
gen_challenge,
gen_flag,
gen_solve
gen_solve,
)
@@ -22,25 +22,25 @@ def test_scoreboard_is_cached():
# create challenge
chal = gen_challenge(app.db, value=100)
gen_flag(app.db, challenge_id=chal.id, content='flag')
gen_flag(app.db, challenge_id=chal.id, content="flag")
chal_id = chal.id
# create a solve for the challenge for user1. (the id is 2 because of the admin)
gen_solve(app.db, user_id=2, challenge_id=chal_id)
with login_as_user(app, 'user1') as client:
with login_as_user(app, "user1") as client:
# No cached data
assert app.cache.get('view/api.scoreboard_scoreboard_list') is None
assert app.cache.get('view/api.scoreboard_scoreboard_detail') is None
assert app.cache.get("view/api.scoreboard_scoreboard_list") is None
assert app.cache.get("view/api.scoreboard_scoreboard_detail") is None
# Load and check cached data
client.get('/api/v1/scoreboard')
assert app.cache.get('view/api.scoreboard_scoreboard_list')
client.get('/api/v1/scoreboard/top/10')
assert app.cache.get('view/api.scoreboard_scoreboard_detail')
client.get("/api/v1/scoreboard")
assert app.cache.get("view/api.scoreboard_scoreboard_list")
client.get("/api/v1/scoreboard/top/10")
assert app.cache.get("view/api.scoreboard_scoreboard_detail")
# Empty standings and check that the cached data is gone
clear_standings()
assert app.cache.get('view/api.scoreboard_scoreboard_list') is None
assert app.cache.get('view/api.scoreboard_scoreboard_detail') is None
assert app.cache.get("view/api.scoreboard_scoreboard_list") is None
assert app.cache.get("view/api.scoreboard_scoreboard_detail") is None
destroy_ctfd(app)