pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
richard-dds 2018-06-26 16:38:34 -04:00
parent 63b5f477f1
commit f70bc7128e
5 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Pipfile.lock generated
View File

@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
"sha256": "357ba55027d4ffbb2cbc2d9bd034c1995407b3ac87f27a54d3f26c543019e5c6"
"sha256": "5f91978d61968a720e4edc404ea36123ff96d857c1d7ff865f5aaef9b133db37"
},
"pipfile-spec": 6,
"requires": {

10
atst/handler.py
View File

@ -22,12 +22,12 @@ class BaseHandler(tornado.web.RequestHandler):
return ns
def get_current_user(self):
if self.get_secure_cookie('atst'):
if self.get_secure_cookie("atst"):
return {
'id': '9cb348f0-8102-4962-88c4-dac8180c904c',
'email': 'fake.user@mail.com',
'first_name': 'Fake',
'last_name': 'User'
"id": "9cb348f0-8102-4962-88c4-dac8180c904c",
"email": "fake.user@mail.com",
"first_name": "Fake",
"last_name": "User",
}
else:
return None

22
atst/handlers/request.py
View File

@ -3,17 +3,18 @@ import pendulum
from atst.handler import BaseHandler
def map_request(user, request):
time_created = pendulum.parse(request['time_created'])
time_created = pendulum.parse(request["time_created"])
is_new = time_created.add(days=1) > pendulum.now()
return {
'order_id': request['id'],
'is_new': is_new,
'status': request['status'],
'app_count': 1,
'date': time_created.format('M/DD/YYYY'),
'full_name': '{} {}'.format(user['first_name'], user['last_name'])
"order_id": request["id"],
"is_new": is_new,
"status": request["status"],
"app_count": 1,
"date": time_created.format("M/DD/YYYY"),
"full_name": "{} {}".format(user["first_name"], user["last_name"]),
}
@ -27,7 +28,8 @@ class Request(BaseHandler):
def get(self):
user = self.get_current_user()
response = yield self.requests_client.get(
'/users/{}/requests'.format(user['id']))
requests = response.json['requests']
"/users/{}/requests".format(user["id"])
)
requests = response.json["requests"]
mapped_requests = [map_request(user, request) for request in requests]
self.render('requests.html.to', page=self.page, requests=mapped_requests)
self.render("requests.html.to", page=self.page, requests=mapped_requests)

4
atst/handlers/request_new.py
View File

@ -86,8 +86,8 @@ class RequestNew(BaseHandler):
@tornado.gen.coroutine
def create_or_update_request(self, form_data, request_id=None):
request_data = {
'creator_id': self.get_current_user()['id'],
'request': form_data
"creator_id": self.get_current_user()["id"],
"request": form_data,
}
if request_id:
response = yield self.requests_client.patch(

28
tests/handlers/test_request_new.py
View File

@ -1,21 +1,23 @@
import re
import pytest
ERROR_CLASS = 'usa-input-error-message'
ERROR_CLASS = "usa-input-error-message"
MOCK_USER = {
'id': '9cb348f0-8102-4962-88c4-dac8180c904c',
'email': 'fake.user@mail.com',
'first_name': 'Fake',
'last_name': 'User'
"id": "9cb348f0-8102-4962-88c4-dac8180c904c",
"email": "fake.user@mail.com",
"first_name": "Fake",
"last_name": "User",
}
@pytest.mark.gen_test
def test_submit_invalid_request_form(monkeypatch, http_client, base_url):
monkeypatch.setattr(
'atst.handlers.request_new.RequestNew.get_current_user',
lambda s: MOCK_USER)
monkeypatch.setattr('atst.handlers.request_new.RequestNew.check_xsrf_cookie', lambda s: True)
"atst.handlers.request_new.RequestNew.get_current_user", lambda s: MOCK_USER
)
monkeypatch.setattr(
"atst.handlers.request_new.RequestNew.check_xsrf_cookie", lambda s: True
)
# this just needs to send a known invalid form value
response = yield http_client.fetch(
base_url + "/requests/new",
@ -30,10 +32,12 @@ def test_submit_invalid_request_form(monkeypatch, http_client, base_url):
@pytest.mark.gen_test
def test_submit_valid_request_form(monkeypatch, http_client, base_url):
monkeypatch.setattr(
'atst.handlers.request_new.RequestNew.get_current_user',
lambda s: MOCK_USER)
monkeypatch.setattr('atst.handlers.request_new.RequestNew.check_xsrf_cookie', lambda s: True)
monkeypatch.setattr('atst.forms.request.RequestForm.validate', lambda s: True)
"atst.handlers.request_new.RequestNew.get_current_user", lambda s: MOCK_USER
)
monkeypatch.setattr(
"atst.handlers.request_new.RequestNew.check_xsrf_cookie", lambda s: True
)
monkeypatch.setattr("atst.forms.request.RequestForm.validate", lambda s: True)
# this just needs to send a known invalid form value
response = yield http_client.fetch(