From af500a96e7a7c28ee09824c16d1160c5e5e81fc7 Mon Sep 17 00:00:00 2001 From: Nicholas Staples Date: Wed, 11 May 2016 11:20:45 +0100 Subject: [PATCH] Update all dates to use utc, only in the template is it converted to british time. --- app/main/views/dashboard.py | 4 ++-- app/main/views/register.py | 2 +- tests/__init__.py | 6 +++--- tests/app/main/views/test_new_password.py | 8 ++++---- tests/conftest.py | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index 75df0003c..e5c2f1eb8 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -109,7 +109,7 @@ def weekly(service_id): date_from=earliest_date )['data'] ), - now=datetime.now() + now=datetime.utcnow() ) @@ -154,7 +154,7 @@ def add_rates_to(delivery_statistics): if delivery_statistics['sms_requested'] else 0 ), week_end_datetime=parser.parse( - delivery_statistics.get('week_end', str(datetime.now())) + delivery_statistics.get('week_end', str(datetime.utcnow())) ), **delivery_statistics ) diff --git a/app/main/views/register.py b/app/main/views/register.py index 2e5fdcaf9..f16446e06 100644 --- a/app/main/views/register.py +++ b/app/main/views/register.py @@ -81,7 +81,7 @@ def _do_registration(form, service=None, send_sms=True, send_email=True): if send_sms: user_api_client.send_verify_code(user.id, 'sms', user.mobile_number) - session['expiry_date'] = str(datetime.now() + timedelta(hours=1)) + session['expiry_date'] = str(datetime.utcnow() + timedelta(hours=1)) session['user_details'] = {"email": user.email_address, "id": user.id} return True else: diff --git a/tests/__init__.py b/tests/__init__.py index f3adcf85d..28513e7df 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -101,7 +101,7 @@ def create_test_api_user(state, permissions={}): def job_json(): job_id = str(generate_uuid()) - created_at = str(datetime.datetime.now().time()) + created_at = str(datetime.datetime.utcnow().time()) data = { 'id': job_id, 'service': 1, @@ -128,9 +128,9 @@ def notification_json(service_id, if template is None: template = template_json(service_id, str(generate_uuid())) if sent_at is None: - sent_at = str(datetime.datetime.now().time()) + sent_at = str(datetime.datetime.utcnow().time()) if created_at is None: - created_at = str(datetime.datetime.now().time()) + created_at = str(datetime.datetime.utcnow().time()) links = {} if with_links: links = { diff --git a/tests/app/main/views/test_new_password.py b/tests/app/main/views/test_new_password.py index 7c0a251e9..f52de9da5 100644 --- a/tests/app/main/views/test_new_password.py +++ b/tests/app/main/views/test_new_password.py @@ -12,7 +12,7 @@ def test_should_render_new_password_template(app_, mock_get_user_by_email_request_password_reset): with app_.test_request_context(): with app_.test_client() as client: - data = json.dumps({'email': api_user_active.email_address, 'created_at': str(datetime.now())}) + data = json.dumps({'email': api_user_active.email_address, 'created_at': str(datetime.utcnow())}) token = generate_token(data, app_.config['SECRET_KEY'], app_.config['DANGEROUS_SALT']) response = client.get(url_for('.new_password', token=token)) @@ -23,7 +23,7 @@ def test_should_render_new_password_template(app_, def test_should_return_404_when_email_address_does_not_exist(app_, mock_get_user_by_email_not_found): with app_.test_request_context(): with app_.test_client() as client: - data = json.dumps({'email': 'no_user@d.gov.uk', 'created_at': str(datetime.now())}) + data = json.dumps({'email': 'no_user@d.gov.uk', 'created_at': str(datetime.utcnow())}) token = generate_token(data, app_.config['SECRET_KEY'], app_.config['DANGEROUS_SALT']) response = client.get(url_for('.new_password', token=token)) assert response.status_code == 404 @@ -36,7 +36,7 @@ def test_should_redirect_to_two_factor_when_password_reset_is_successful(app_, with app_.test_request_context(): with app_.test_client() as client: user = mock_get_user_by_email_request_password_reset.return_value - data = json.dumps({'email': user.email_address, 'created_at': str(datetime.now())}) + data = json.dumps({'email': user.email_address, 'created_at': str(datetime.utcnow())}) token = generate_token(data, app_.config['SECRET_KEY'], app_.config['DANGEROUS_SALT']) response = client.post(url_for('.new_password', token=token), data={'new_password': 'a-new_password'}) assert response.status_code == 302 @@ -51,7 +51,7 @@ def test_should_redirect_index_if_user_has_already_changed_password(app_, with app_.test_request_context(): with app_.test_client() as client: user = mock_get_user_by_email_user_changed_password.return_value - data = json.dumps({'email': user.email_address, 'created_at': str(datetime.now())}) + data = json.dumps({'email': user.email_address, 'created_at': str(datetime.utcnow())}) token = generate_token(data, app_.config['SECRET_KEY'], app_.config['DANGEROUS_SALT']) response = client.post(url_for('.new_password', token=token), data={'new_password': 'a-new_password'}) assert response.status_code == 302 diff --git a/tests/conftest.py b/tests/conftest.py index 08c657926..8a779aae4 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -456,7 +456,7 @@ def api_user_changed_password(fake_uuid): 'state': 'active', 'failed_login_count': 5, 'permissions': {}, - 'password_changed_at': str(datetime.now() + timedelta(minutes=1)) + 'password_changed_at': str(datetime.utcnow() + timedelta(minutes=1)) } user = User(user_data) return user @@ -830,7 +830,7 @@ def sample_invite(mocker, service_one, status='pending'): email_address = 'invited_user@test.gov.uk' service_id = service_one['id'] permissions = 'send_messages,manage_service,manage_api_keys' - created_at = str(datetime.now()) + created_at = str(datetime.utcnow()) return invite_json(id_, from_user, service_id, email_address, permissions, created_at, status)