mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-07-26 02:49:16 -04:00
Make ‘Available for…’ text on job page relative
When we say ‘delivery information is available for 7 days’ you have to infer _when_ the seven days starts. When you come back to the page it still says ‘available for 7 days’ even if you only have a day left to download it. This is confusing. This commit changes the text to be relative to now, eg ‘available for 7 days’, ‘available for 1 day’. The date is counted to midnight on the seventh day, which is when the data is actually deleted.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import pytest
|
||||
import uuid
|
||||
from datetime import datetime, timedelta, date
|
||||
from datetime import datetime, timedelta, date, timezone
|
||||
from flask.testing import FlaskClient
|
||||
from flask import url_for
|
||||
from flask_login import login_user
|
||||
@@ -155,7 +155,7 @@ def job_json(service_id,
|
||||
if template_id is None:
|
||||
template_id = str(generate_uuid())
|
||||
if created_at is None:
|
||||
created_at = str(datetime.utcnow().time())
|
||||
created_at = str(datetime.now(timezone.utc).strftime('%Y-%m-%dT%H:%M:%S.%f%z'))
|
||||
if status is None:
|
||||
status = 'Delivered'
|
||||
data = {
|
||||
|
||||
@@ -97,7 +97,7 @@ def test_should_show_page_for_one_job(
|
||||
status=status_argument
|
||||
)
|
||||
assert csv_link.text == 'Download this report'
|
||||
assert page.find('span', {'id': 'time-left'}).text == 'Available for 7 days'
|
||||
assert page.find('span', {'id': 'time-left'}).text == 'Data available for 7 days'
|
||||
mock_get_notifications.assert_called_with(
|
||||
service_one['id'],
|
||||
fake_uuid,
|
||||
|
||||
Reference in New Issue
Block a user