darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-23 15:57:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3426 from alphagov/update-utils-large-frag-count

Browse Source 
Update utils to the latest version
This commit is contained in:
Rebecca Law
2020-04-27 16:41:58 +01:00
committed by GitHub
parent 33786fc3d9 347209f5c0
commit b2118057ef
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/templates/views/pricing/index.html
View File

@@ -56,6 +56,8 @@
('Up to 306 characters', '2 text messages'), ('Up to 306 characters', '2 text messages'),
('Up to 459 characters', '3 text messages'), ('Up to 459 characters', '3 text messages'),
('Up to 612 characters', '4 text messages'), ('Up to 612 characters', '4 text messages'),
('Up to 765 characters', '5 text messages'),
('Up to 918 characters', '6 text messages'),
] %} ] %}
{% call row() %} {% call row() %}
{{ text_field(message_length) }} {{ text_field(message_length) }}

2
requirements-app.txt
View File

@@ -24,5 +24,5 @@ WTForms==2.2.1 # Pinned because of breaking change in 2.3.0
awscli-cwlogs>=1.4,<1.5 awscli-cwlogs>=1.4,<1.5
itsdangerous==1.1.0 itsdangerous==1.1.0
git+https://github.com/alphagov/notifications-utils.git@37.2.0#egg=notifications-utils==37.2.0 git+https://github.com/alphagov/notifications-utils.git@37.3.0#egg=notifications-utils==37.3.0
git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.5.1-alpha#egg=govuk-frontend-jinja==0.5.1-alpha git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.5.1-alpha#egg=govuk-frontend-jinja==0.5.1-alpha

2
requirements.txt
View File

@@ -26,7 +26,7 @@ WTForms==2.2.1 # Pinned because of breaking change in 2.3.0
awscli-cwlogs>=1.4,<1.5 awscli-cwlogs>=1.4,<1.5
itsdangerous==1.1.0 itsdangerous==1.1.0
git+https://github.com/alphagov/notifications-utils.git@37.2.0#egg=notifications-utils==37.2.0 git+https://github.com/alphagov/notifications-utils.git@37.3.0#egg=notifications-utils==37.3.0
git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.5.1-alpha#egg=govuk-frontend-jinja==0.5.1-alpha git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.5.1-alpha#egg=govuk-frontend-jinja==0.5.1-alpha
## The following requirements were added by pip freeze: ## The following requirements were added by pip freeze:

8
tests/app/main/views/test_send.py
View File

@@ -510,7 +510,7 @@ def test_upload_csv_file_with_very_long_placeholder_shows_check_page_with_errors
mock_get_jobs, mock_get_jobs,
fake_uuid, fake_uuid,
): ):
big_placeholder = ' '.join(['not ok'] * 102) big_placeholder = ' '.join(['not ok'] * 402)
mocker.patch( mocker.patch(
'app.main.views.send.s3download', 'app.main.views.send.s3download',
return_value=f""" return_value=f"""
@@ -4080,7 +4080,7 @@ TRIAL_MODE_MSG = (
'Cannot send to this recipient when service is in trial mode – ' 'Cannot send to this recipient when service is in trial mode – '
'see https://www.notifications.service.gov.uk/trial-mode' 'see https://www.notifications.service.gov.uk/trial-mode'
) )
TOO_LONG_MSG = 'Text messages cannot be longer than 612 characters. Your message is 654 characters.' TOO_LONG_MSG = 'Text messages cannot be longer than 918 characters. Your message is 954 characters.'
SERVICE_DAILY_LIMIT_MSG = 'Exceeded send limits (1000) for today' SERVICE_DAILY_LIMIT_MSG = 'Exceeded send limits (1000) for today'
@@ -4093,7 +4093,7 @@ SERVICE_DAILY_LIMIT_MSG = 'Exceeded send limits (1000) for today'
( (
TOO_LONG_MSG, TOO_LONG_MSG,
'Message too long', 'Message too long',
'Text messages cannot be longer than 612 characters. Your message is 654 characters.' 'Text messages cannot be longer than 918 characters. Your message is 954 characters.'
), ),
( (
SERVICE_DAILY_LIMIT_MSG, SERVICE_DAILY_LIMIT_MSG,
@@ -4121,7 +4121,7 @@ def test_send_notification_shows_error_if_400(
) )
with client_request.session_transaction() as session: with client_request.session_transaction() as session:
session['recipient'] = '07700900001' session['recipient'] = '07700900001'
session['placeholders'] = {'name': 'a' * 600} session['placeholders'] = {'name': 'a' * 900}
page = client_request.post( page = client_request.post(
'main.send_notification', 'main.send_notification',