aljaz/CTFd
1
0
Fork 0
mirror of https://github.com/aljazceru/CTFd.git synced 2025-12-17 22:14:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Format all the things (#991)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

95
tests/users/test_settings.py
View File

@@ -3,12 +3,7 @@
from CTFd.models import Users
from CTFd.utils.crypto import verify_password
from tests.helpers import (
create_ctfd,
register_user,
login_as_user,
destroy_ctfd
)
from tests.helpers import create_ctfd, register_user, login_as_user, destroy_ctfd
def test_user_set_profile():
@@ -19,45 +14,45 @@ def test_user_set_profile():
client = login_as_user(app)
data = {
'name': 'user',
'email': 'user@ctfd.io',
'confirm': '',
'password': '',
'affiliation': 'affiliation_test',
'website': 'https://ctfd.io',
'country': 'US',
"name": "user",
"email": "user@ctfd.io",
"confirm": "",
"password": "",
"affiliation": "affiliation_test",
"website": "https://ctfd.io",
"country": "US",
}
r = client.patch('/api/v1/users/me', json=data)
r = client.patch("/api/v1/users/me", json=data)
assert r.status_code == 200
user = Users.query.filter_by(id=2).first()
assert user.affiliation == data['affiliation']
assert user.website == data['website']
assert user.country == data['country']
assert user.affiliation == data["affiliation"]
assert user.website == data["website"]
assert user.country == data["country"]
r = client.get('/settings')
r = client.get("/settings")
resp = r.get_data(as_text=True)
for k, v in data.items():
assert v in resp
data = {
'name': 'user',
'email': 'user@ctfd.io',
'confirm': '',
'password': '',
'affiliation': '',
'website': '',
'country': '',
"name": "user",
"email": "user@ctfd.io",
"confirm": "",
"password": "",
"affiliation": "",
"website": "",
"country": "",
}
r = client.patch('/api/v1/users/me', json=data)
r = client.patch("/api/v1/users/me", json=data)
assert r.status_code == 200
user = Users.query.filter_by(id=2).first()
assert user.affiliation == data['affiliation']
assert user.website == data['website']
assert user.country == data['country']
assert user.affiliation == data["affiliation"]
assert user.website == data["website"]
assert user.country == data["country"]
destroy_ctfd(app)
@@ -69,42 +64,38 @@ def test_user_can_change_password():
client = login_as_user(app)
data = {
'name': 'user',
'email': 'user@ctfd.io',
'confirm': '',
'password': 'new_password',
'affiliation': '',
'website': '',
'country': '',
"name": "user",
"email": "user@ctfd.io",
"confirm": "",
"password": "new_password",
"affiliation": "",
"website": "",
"country": "",
}
r = client.patch('/api/v1/users/me', json=data)
r = client.patch("/api/v1/users/me", json=data)
user = Users.query.filter_by(id=2).first()
assert verify_password(data['password'], user.password) is False
assert verify_password(data["password"], user.password) is False
assert r.status_code == 400
assert r.get_json() == {
'errors': {
'confirm': ['Please confirm your current password']
},
'success': False
"errors": {"confirm": ["Please confirm your current password"]},
"success": False,
}
data['confirm'] = 'wrong_password'
data["confirm"] = "wrong_password"
r = client.patch('/api/v1/users/me', json=data)
r = client.patch("/api/v1/users/me", json=data)
user = Users.query.filter_by(id=2).first()
assert verify_password(data['password'], user.password) is False
assert verify_password(data["password"], user.password) is False
assert r.status_code == 400
assert r.get_json() == {
'errors': {
'confirm': ['Your previous password is incorrect']
},
'success': False
"errors": {"confirm": ["Your previous password is incorrect"]},
"success": False,
}
data['confirm'] = 'password'
r = client.patch('/api/v1/users/me', json=data)
data["confirm"] = "password"
r = client.patch("/api/v1/users/me", json=data)
assert r.status_code == 200
user = Users.query.filter_by(id=2).first()
assert verify_password(data['password'], user.password) is True
assert verify_password(data["password"], user.password) is True
destroy_ctfd(app)