mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-20 14:29:51 -04:00
a78d9d5048
The options for scheduling a job by time should be grouped by day, because a long list of 96 options is not very usable. On the server side, this commit generates label for the next 4 days in a friendly format (ie today/tomorrow/Sunday/Monday) The Javascript component for choosing a time was built in a kind of old-school jQuery way, where it manipulated the elements on the page. The complexity of introducing groups of options was just too much for this pattern, because it involves storing a lot of state in the DOM. This commit completely rewrites the JS to: - read the initial options and groups from the HTML and store them in the object - use Hogan to completely re-render the UI from a series of Mustache templates, each of which represents a state of the UI and takes the inital options and groups - filter the choices to show when the today/tomorrow/… buttons are clicked
46 lines
1.4 KiB
Python
46 lines
1.4 KiB
Python
import pytest
|
|
|
|
from app.main.forms import ChooseTimeForm
|
|
from freezegun import freeze_time
|
|
|
|
|
|
@freeze_time("2016-01-01 11:09:00.061258")
|
|
def test_form_contains_next_24h(app_):
|
|
|
|
choices = ChooseTimeForm().scheduled_for.choices
|
|
|
|
# Friday
|
|
assert choices[0] == ('', 'Now')
|
|
assert choices[1] == ('2016-01-01T12:00:00.061258', 'Today at midday')
|
|
assert choices[13] == ('2016-01-02T00:00:00.061258', 'Today at midnight')
|
|
|
|
# Saturday
|
|
assert choices[14] == ('2016-01-02T01:00:00.061258', 'Tomorrow at 1am')
|
|
assert choices[37] == ('2016-01-03T00:00:00.061258', 'Tomorrow at midnight')
|
|
|
|
# Sunday
|
|
assert choices[38] == ('2016-01-03T01:00:00.061258', 'Sunday at 1am')
|
|
|
|
# Monday
|
|
assert choices[84] == ('2016-01-04T23:00:00.061258', 'Monday at 11pm')
|
|
assert choices[85] == ('2016-01-05T00:00:00.061258', 'Monday at midnight')
|
|
|
|
with pytest.raises(IndexError):
|
|
assert choices[
|
|
12 + # hours left in the day
|
|
(3 * 24) + # 3 days
|
|
2 # magic number
|
|
]
|
|
|
|
|
|
@freeze_time("2016-01-01 11:09:00.061258")
|
|
def test_form_defaults_to_now(app_):
|
|
assert ChooseTimeForm().scheduled_for.data == ''
|
|
|
|
|
|
@freeze_time("2016-01-01 11:09:00.061258")
|
|
def test_form_contains_next_three_days(app_):
|
|
assert ChooseTimeForm().scheduled_for.categories == [
|
|
'Today', 'Tomorrow', 'Sunday', 'Monday'
|
|
]
|