Merge pull request #979 from alphagov/4-days-scheduled

Allow a job to be scheduled any time in next 4 days

tests/app/main/test_choose_time_form.py

@@ -9,14 +9,37 @@ 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', 'Midday')
-    assert choices[23] == ('2016-01-02T10:00:00.061258', '10am')
+    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[24]
+        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 == [
+        'Later today', 'Tomorrow', 'Sunday', 'Monday'
+    ]

tests/app/main/views/test_dashboard.py

@@ -194,10 +194,10 @@ def test_should_show_upcoming_jobs_on_dashboard(
     assert len(table_rows) == 2
 
     assert 'send_me_later.csv' in table_rows[0].find_all('th')[0].text
-    assert 'Sending at 11:09am' in table_rows[0].find_all('th')[0].text
+    assert 'Sending today at 11:09am' in table_rows[0].find_all('th')[0].text
     assert table_rows[0].find_all('td')[0].text.strip() == '1'
     assert 'even_later.csv' in table_rows[1].find_all('th')[0].text
-    assert 'Sending at 11:09pm' in table_rows[1].find_all('th')[0].text
+    assert 'Sending today at 11:09pm' in table_rows[1].find_all('th')[0].text
     assert table_rows[1].find_all('td')[0].text.strip() == '1'
 
 

tests/app/main/views/test_jobs.py

@@ -142,6 +142,7 @@ def test_should_show_job_in_progress(
         assert page.find('p', {'class': 'hint'}).text.strip() == 'Report is 50% complete…'
 
 
+@freeze_time("2016-01-01T00:00:00.061258")
 def test_should_show_scheduled_job(
     app_,
     service_one,
@@ -162,7 +163,7 @@ def test_should_show_scheduled_job(
 
         assert response.status_code == 200
         page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
-        assert page.find('main').find_all('p')[2].text.strip() == 'Sending will start at midnight'
+        assert page.find('main').find_all('p')[2].text.strip() == 'Sending will start today at midnight'
         assert page.find('input', {'type': 'submit', 'value': 'Cancel sending'})
 
 
@@ -266,7 +267,7 @@ def test_should_show_updates_for_one_job_as_json(
         assert 'Status' in content['notifications']
         assert 'Delivered' in content['notifications']
         assert '12:01am' in content['notifications']
-        assert 'Uploaded by Test User on 1 January at midnight' in content['status']
+        assert 'Sent by Test User on 1 January at midnight' in content['status']
 
 
 @pytest.mark.parametrize(