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

@@ -7,12 +7,12 @@ def test_override_template():
"""Does override_template work properly for regular themes"""
app = create_ctfd()
with app.app_context():
override_template('login.html', 'LOGIN OVERRIDE')
override_template("login.html", "LOGIN OVERRIDE")
with app.test_client() as client:
r = client.get('/login')
r = client.get("/login")
assert r.status_code == 200
output = r.get_data(as_text=True)
assert 'LOGIN OVERRIDE' in output
assert "LOGIN OVERRIDE" in output
destroy_ctfd(app)
@@ -20,38 +20,38 @@ def test_admin_override_template():
"""Does override_template work properly for the admin panel"""
app = create_ctfd()
with app.app_context():
override_template('admin/users/user.html', 'ADMIN TEAM OVERRIDE')
override_template("admin/users/user.html", "ADMIN TEAM OVERRIDE")
client = login_as_user(app, name="admin", password="password")
r = client.get('/admin/users/1')
r = client.get("/admin/users/1")
assert r.status_code == 200
output = r.get_data(as_text=True)
assert 'ADMIN TEAM OVERRIDE' in output
assert "ADMIN TEAM OVERRIDE" in output
destroy_ctfd(app)
def test_register_plugin_script():
'''Test that register_plugin_script adds script paths to the core theme'''
"""Test that register_plugin_script adds script paths to the core theme"""
app = create_ctfd()
with app.app_context():
register_plugin_script('/fake/script/path.js')
register_plugin_script('http://ctfd.io/fake/script/path.js')
register_plugin_script("/fake/script/path.js")
register_plugin_script("http://ctfd.io/fake/script/path.js")
with app.test_client() as client:
r = client.get('/')
r = client.get("/")
output = r.get_data(as_text=True)
assert '/fake/script/path.js' in output
assert 'http://ctfd.io/fake/script/path.js' in output
assert "/fake/script/path.js" in output
assert "http://ctfd.io/fake/script/path.js" in output
destroy_ctfd(app)
def test_register_plugin_stylesheet():
'''Test that register_plugin_stylesheet adds stylesheet paths to the core theme'''
"""Test that register_plugin_stylesheet adds stylesheet paths to the core theme"""
app = create_ctfd()
with app.app_context():
register_plugin_script('/fake/stylesheet/path.css')
register_plugin_script('http://ctfd.io/fake/stylesheet/path.css')
register_plugin_script("/fake/stylesheet/path.css")
register_plugin_script("http://ctfd.io/fake/stylesheet/path.css")
with app.test_client() as client:
r = client.get('/')
r = client.get("/")
output = r.get_data(as_text=True)
assert '/fake/stylesheet/path.css' in output
assert 'http://ctfd.io/fake/stylesheet/path.css' in output
assert "/fake/stylesheet/path.css" in output
assert "http://ctfd.io/fake/stylesheet/path.css" in output
destroy_ctfd(app)