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

test no longer applicable as null sms_sender is an error now

Browse Source
This commit is contained in:
Leo Hemsted
2017-05-22 17:24:31 +01:00
parent eb6edf06a3
commit 25011f09ef
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
migrations/versions/0085_govuk_sms_sender.py → migrations/versions/0086_govuk_sms_sender.py
View File

@@ -1,14 +1,14 @@
"""empty message """empty message
Revision ID: 0085_govuk_sms_sender Revision ID: 0086_govuk_sms_sender
Revises: 0084_add_job_stats Revises: 0085_update_incoming_to_inbound
Create Date: 2017-05-22 13:46:09.584801 Create Date: 2017-05-22 13:46:09.584801
""" """
# revision identifiers, used by Alembic. # revision identifiers, used by Alembic.
revision = '0085_govuk_sms_sender' revision = '0086_govuk_sms_sender'
down_revision = '0084_add_job_stats' down_revision = '0085_update_incoming_to_inbound'
from alembic import op from alembic import op

1
tests/app/delivery/test_send_to_providers.py
View File

@@ -627,7 +627,6 @@ def test_should_set_international_phone_number_to_sent_status(
# if 40604 is actually in DB then treat that as if entered manually # if 40604 is actually in DB then treat that as if entered manually
('40604', '40604', 'bar'), ('40604', '40604', 'bar'),
# 'testing' is the FROM_NUMBER during unit tests # 'testing' is the FROM_NUMBER during unit tests
(None, 'testing', 'Sample service: bar'),
('testing', 'testing', 'Sample service: bar'), ('testing', 'testing', 'Sample service: bar'),
]) ])
def test_should_handle_sms_sender_and_prefix_message( def test_should_handle_sms_sender_and_prefix_message(

6
tests/app/service/test_rest.py
View File

@@ -240,11 +240,7 @@ def test_create_service(client, sample_user):
assert json_resp['data']['email_from'] == 'created.service' assert json_resp['data']['email_from'] == 'created.service'
assert not json_resp['data']['research_mode'] assert not json_resp['data']['research_mode']
assert json_resp['data']['dvla_organisation'] == '001' assert json_resp['data']['dvla_organisation'] == '001'
<<<<<<< HEAD
assert json_resp['data']['sms_sender'] == current_app.config['FROM_NUMBER'] assert json_resp['data']['sms_sender'] == current_app.config['FROM_NUMBER']
=======
assert json_resp['data']['sms_sender'] == 'GOVUK'
>>>>>>> set sms_sender to be 'GOVUK' if not otherwise specified
service_db = Service.query.get(json_resp['data']['id']) service_db = Service.query.get(json_resp['data']['id'])
assert service_db.name == 'created service' assert service_db.name == 'created service'
@@ -1369,7 +1365,7 @@ def test_set_sms_sender_for_service_rejects_null(client, sample_service):
result = json.loads(resp.get_data(as_text=True)) result = json.loads(resp.get_data(as_text=True))
assert resp.status_code == 400 assert resp.status_code == 400
assert result['result'] == 'error' assert result['result'] == 'error'
assert result['message'] == {'sms_sender': 'Field may not be null.'} assert result['message'] == {'sms_sender': ['Field may not be null.']}
@pytest.mark.parametrize('today_only,stats', [ @pytest.mark.parametrize('today_only,stats', [