darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-02 17:48:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

update letter tests to use correct service

Browse Source 
previously they were using sample_service fixture under the hood, but
with full permissions added - this works fine, **unless** there's
already a service with the name "sample service" in the database. This
can happen for two reasons:

* A previous test didn't tear down correctly
* This test already invoked the sample_service fixture somehow

If this happens, we just return the existing service, without modifying
its values - values that we might change in tests, such as
research mode or letters permissions.

In the future, we'll have to be vigilant! and aware! and careful! to
not use sample_service if we're doing tests involving letters, since
they create a service with a different name now
This commit is contained in:
Leo Hemsted
2017-09-21 11:50:49 +01:00
parent 76106b9f7f
commit e18e78180e
4 changed files with 53 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/run_tests.sh
View File

@@ -31,5 +31,5 @@ pycodestyle .
display_result $? 1 "Code style check" display_result $? 1 "Code style check"
# run with four concurrent threads # run with four concurrent threads
py.test --cov=app --cov-report=term-missing tests/ --junitxml=test_results.xml -n 4 py.test --cov=app --cov-report=term-missing tests/ --junitxml=test_results.xml -n 4 -v
display_result $? 2 "Unit tests" display_result $? 2 "Unit tests"

86
tests/app/celery/test_tasks.py
View File

@@ -45,11 +45,11 @@ from app.models import (
from tests.app import load_example_csv from tests.app import load_example_csv
from tests.conftest import set_config from tests.conftest import set_config
from tests.app.conftest import ( from tests.app.conftest import (
sample_service, sample_service as create_sample_service,
sample_template, sample_template as create_sample_template,
sample_job, sample_job as create_sample_job,
sample_email_template, sample_email_template as create_sample_email_template,
sample_notification sample_notification as create_sample_notification
) )
from tests.app.db import create_user, create_notification, create_job, create_service_inbound_api, create_inbound_sms from tests.app.db import create_user, create_notification, create_job, create_service_inbound_api, create_inbound_sms
@@ -82,7 +82,7 @@ def test_should_have_decorated_tasks_functions():
@pytest.fixture @pytest.fixture
def email_job_with_placeholders(notify_db, notify_db_session, sample_email_template_with_placeholders): def email_job_with_placeholders(notify_db, notify_db_session, sample_email_template_with_placeholders):
return sample_job(notify_db, notify_db_session, template=sample_email_template_with_placeholders) return create_sample_job(notify_db, notify_db_session, template=sample_email_template_with_placeholders)
# -------------- process_job tests -------------- # # -------------- process_job tests -------------- #
@@ -123,8 +123,8 @@ def test_should_process_sms_job(sample_job, mocker):
def test_should_not_process_sms_job_if_would_exceed_send_limits(notify_db, def test_should_not_process_sms_job_if_would_exceed_send_limits(notify_db,
notify_db_session, notify_db_session,
mocker): mocker):
service = sample_service(notify_db, notify_db_session, limit=9) service = create_sample_service(notify_db, notify_db_session, limit=9)
job = sample_job(notify_db, notify_db_session, service=service, notification_count=10) job = create_sample_job(notify_db, notify_db_session, service=service, notification_count=10)
mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('multiple_sms')) mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('multiple_sms'))
mocker.patch('app.celery.tasks.process_row') mocker.patch('app.celery.tasks.process_row')
@@ -142,10 +142,10 @@ def test_should_not_process_sms_job_if_would_exceed_send_limits(notify_db,
def test_should_not_process_sms_job_if_would_exceed_send_limits_inc_today(notify_db, def test_should_not_process_sms_job_if_would_exceed_send_limits_inc_today(notify_db,
notify_db_session, notify_db_session,
mocker): mocker):
service = sample_service(notify_db, notify_db_session, limit=1) service = create_sample_service(notify_db, notify_db_session, limit=1)
job = sample_job(notify_db, notify_db_session, service=service) job = create_sample_job(notify_db, notify_db_session, service=service)
sample_notification(notify_db, notify_db_session, service=service, job=job) create_sample_notification(notify_db, notify_db_session, service=service, job=job)
mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('sms')) mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('sms'))
mocker.patch('app.celery.tasks.process_row') mocker.patch('app.celery.tasks.process_row')
@@ -161,11 +161,11 @@ def test_should_not_process_sms_job_if_would_exceed_send_limits_inc_today(notify
def test_should_not_process_email_job_if_would_exceed_send_limits_inc_today(notify_db, notify_db_session, mocker): def test_should_not_process_email_job_if_would_exceed_send_limits_inc_today(notify_db, notify_db_session, mocker):
service = sample_service(notify_db, notify_db_session, limit=1) service = create_sample_service(notify_db, notify_db_session, limit=1)
template = sample_email_template(notify_db, notify_db_session, service=service) template = create_sample_email_template(notify_db, notify_db_session, service=service)
job = sample_job(notify_db, notify_db_session, service=service, template=template) job = create_sample_job(notify_db, notify_db_session, service=service, template=template)
sample_notification(notify_db, notify_db_session, service=service, job=job) create_sample_notification(notify_db, notify_db_session, service=service, job=job)
mocker.patch('app.celery.tasks.s3.get_job_from_s3') mocker.patch('app.celery.tasks.s3.get_job_from_s3')
mocker.patch('app.celery.tasks.process_row') mocker.patch('app.celery.tasks.process_row')
@@ -182,9 +182,9 @@ def test_should_not_process_email_job_if_would_exceed_send_limits_inc_today(noti
@freeze_time("2016-01-01 11:09:00.061258") @freeze_time("2016-01-01 11:09:00.061258")
def test_should_not_process_email_job_if_would_exceed_send_limits(notify_db, notify_db_session, mocker): def test_should_not_process_email_job_if_would_exceed_send_limits(notify_db, notify_db_session, mocker):
service = sample_service(notify_db, notify_db_session, limit=0) service = create_sample_service(notify_db, notify_db_session, limit=0)
template = sample_email_template(notify_db, notify_db_session, service=service) template = create_sample_email_template(notify_db, notify_db_session, service=service)
job = sample_job(notify_db, notify_db_session, service=service, template=template) job = create_sample_job(notify_db, notify_db_session, service=service, template=template)
mocker.patch('app.celery.tasks.s3.get_job_from_s3') mocker.patch('app.celery.tasks.s3.get_job_from_s3')
mocker.patch('app.celery.tasks.process_row') mocker.patch('app.celery.tasks.process_row')
@@ -200,7 +200,7 @@ def test_should_not_process_email_job_if_would_exceed_send_limits(notify_db, not
def test_should_not_process_job_if_already_pending(notify_db, notify_db_session, mocker): def test_should_not_process_job_if_already_pending(notify_db, notify_db_session, mocker):
job = sample_job(notify_db, notify_db_session, job_status='scheduled') job = create_sample_job(notify_db, notify_db_session, job_status='scheduled')
mocker.patch('app.celery.tasks.s3.get_job_from_s3') mocker.patch('app.celery.tasks.s3.get_job_from_s3')
mocker.patch('app.celery.tasks.process_row') mocker.patch('app.celery.tasks.process_row')
@@ -217,9 +217,9 @@ def test_should_not_process_job_if_already_pending(notify_db, notify_db_session,
def test_should_process_email_job_if_exactly_on_send_limits(notify_db, def test_should_process_email_job_if_exactly_on_send_limits(notify_db,
notify_db_session, notify_db_session,
mocker): mocker):
service = sample_service(notify_db, notify_db_session, limit=10) service = create_sample_service(notify_db, notify_db_session, limit=10)
template = sample_email_template(notify_db, notify_db_session, service=service) template = create_sample_email_template(notify_db, notify_db_session, service=service)
job = sample_job(notify_db, notify_db_session, service=service, template=template, notification_count=10) job = create_sample_job(notify_db, notify_db_session, service=service, template=template, notification_count=10)
mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('multiple_email')) mocker.patch('app.celery.tasks.s3.get_job_from_s3', return_value=load_example_csv('multiple_email'))
mocker.patch('app.celery.tasks.send_email.apply_async') mocker.patch('app.celery.tasks.send_email.apply_async')
@@ -429,11 +429,11 @@ def test_should_send_template_to_correct_sms_task_and_persist(sample_template_wi
def test_should_put_send_sms_task_in_research_mode_queue_if_research_mode_service(notify_db, notify_db_session, mocker): def test_should_put_send_sms_task_in_research_mode_queue_if_research_mode_service(notify_db, notify_db_session, mocker):
service = sample_service(notify_db, notify_db_session) service = create_sample_service(notify_db, notify_db_session)
service.research_mode = True service.research_mode = True
services_dao.dao_update_service(service) services_dao.dao_update_service(service)
template = sample_template(notify_db, notify_db_session, service=service) template = create_sample_template(notify_db, notify_db_session, service=service)
notification = _notification_json(template, to="+447234123123") notification = _notification_json(template, to="+447234123123")
@@ -457,8 +457,8 @@ def test_should_put_send_sms_task_in_research_mode_queue_if_research_mode_servic
def test_should_send_sms_if_restricted_service_and_valid_number(notify_db, notify_db_session, mocker): def test_should_send_sms_if_restricted_service_and_valid_number(notify_db, notify_db_session, mocker):
user = create_user(mobile_number="07700 900890") user = create_user(mobile_number="07700 900890")
service = sample_service(notify_db, notify_db_session, user=user, restricted=True) service = create_sample_service(notify_db, notify_db_session, user=user, restricted=True)
template = sample_template(notify_db, notify_db_session, service=service) template = create_sample_template(notify_db, notify_db_session, service=service)
notification = _notification_json(template, "+447700900890") # The user’s own number, but in a different format notification = _notification_json(template, "+447700900890") # The user’s own number, but in a different format
mocker.patch('app.celery.provider_tasks.deliver_sms.apply_async') mocker.patch('app.celery.provider_tasks.deliver_sms.apply_async')
@@ -493,8 +493,8 @@ def test_should_send_sms_if_restricted_service_and_non_team_number_with_test_key
notify_db_session, notify_db_session,
mocker): mocker):
user = create_user(mobile_number="07700 900205") user = create_user(mobile_number="07700 900205")
service = sample_service(notify_db, notify_db_session, user=user, restricted=True) service = create_sample_service(notify_db, notify_db_session, user=user, restricted=True)
template = sample_template(notify_db, notify_db_session, service=service) template = create_sample_template(notify_db, notify_db_session, service=service)
notification = _notification_json(template, "07700 900849") notification = _notification_json(template, "07700 900849")
mocked_deliver_sms = mocker.patch('app.celery.provider_tasks.deliver_sms.apply_async') mocked_deliver_sms = mocker.patch('app.celery.provider_tasks.deliver_sms.apply_async')
@@ -519,8 +519,8 @@ def test_should_send_email_if_restricted_service_and_non_team_email_address_with
notify_db_session, notify_db_session,
mocker): mocker):
user = create_user() user = create_user()
service = sample_service(notify_db, notify_db_session, user=user, restricted=True) service = create_sample_service(notify_db, notify_db_session, user=user, restricted=True)
template = sample_template( template = create_sample_template(
notify_db, notify_db_session, service=service, template_type='email', subject_line='Hello' notify_db, notify_db_session, service=service, template_type='email', subject_line='Hello'
) )
@@ -545,8 +545,8 @@ def test_should_send_email_if_restricted_service_and_non_team_email_address_with
def test_should_not_send_sms_if_restricted_service_and_invalid_number(notify_db, notify_db_session, mocker): def test_should_not_send_sms_if_restricted_service_and_invalid_number(notify_db, notify_db_session, mocker):
user = create_user(mobile_number="07700 900205") user = create_user(mobile_number="07700 900205")
service = sample_service(notify_db, notify_db_session, user=user, restricted=True) service = create_sample_service(notify_db, notify_db_session, user=user, restricted=True)
template = sample_template(notify_db, notify_db_session, service=service) template = create_sample_template(notify_db, notify_db_session, service=service)
notification = _notification_json(template, "07700 900849") notification = _notification_json(template, "07700 900849")
mocker.patch('app.celery.provider_tasks.deliver_sms.apply_async') mocker.patch('app.celery.provider_tasks.deliver_sms.apply_async')
@@ -564,8 +564,8 @@ def test_should_not_send_sms_if_restricted_service_and_invalid_number(notify_db,
def test_should_not_send_email_if_restricted_service_and_invalid_email_address(notify_db, notify_db_session, mocker): def test_should_not_send_email_if_restricted_service_and_invalid_email_address(notify_db, notify_db_session, mocker):
user = create_user() user = create_user()
service = sample_service(notify_db, notify_db_session, user=user, restricted=True) service = create_sample_service(notify_db, notify_db_session, user=user, restricted=True)
template = sample_template( template = create_sample_template(
notify_db, notify_db_session, service=service, template_type='email', subject_line='Hello' notify_db, notify_db_session, service=service, template_type='email', subject_line='Hello'
) )
notification = _notification_json(template, to="test@example.com") notification = _notification_json(template, to="test@example.com")
@@ -584,11 +584,11 @@ def test_should_not_send_email_if_restricted_service_and_invalid_email_address(n
def test_should_put_send_email_task_in_research_mode_queue_if_research_mode_service( def test_should_put_send_email_task_in_research_mode_queue_if_research_mode_service(
notify_db, notify_db_session, mocker notify_db, notify_db_session, mocker
): ):
service = sample_service(notify_db, notify_db_session) service = create_sample_service(notify_db, notify_db_session)
service.research_mode = True service.research_mode = True
services_dao.dao_update_service(service) services_dao.dao_update_service(service)
template = sample_email_template(notify_db, notify_db_session, service=service) template = create_sample_email_template(notify_db, notify_db_session, service=service)
notification = _notification_json(template, to="test@test.com") notification = _notification_json(template, to="test@test.com")
@@ -611,10 +611,10 @@ def test_should_put_send_email_task_in_research_mode_queue_if_research_mode_serv
def test_should_not_build_dvla_file_in_research_mode_for_letter_job( def test_should_not_build_dvla_file_in_research_mode_for_letter_job(
mocker, sample_service, sample_letter_job, fake_uuid mocker, sample_letter_job, fake_uuid
): ):
test_encrypted_data = 'some encrypted data' test_encrypted_data = 'some encrypted data'
sample_service.research_mode = True sample_letter_job.service.research_mode = True
csv = """address_line_1,address_line_2,address_line_3,address_line_4,postcode,name csv = """address_line_1,address_line_2,address_line_3,address_line_4,postcode,name
A1,A2,A3,A4,A_POST,Alice A1,A2,A3,A4,A_POST,Alice
@@ -633,10 +633,10 @@ def test_should_not_build_dvla_file_in_research_mode_for_letter_job(
@freeze_time("2017-08-29 17:30:00") @freeze_time("2017-08-29 17:30:00")
def test_should_update_job_to_sent_to_dvla_in_research_mode_for_letter_job( def test_should_update_job_to_sent_to_dvla_in_research_mode_for_letter_job(
mocker, sample_service, sample_letter_job, fake_uuid mocker, sample_letter_job, fake_uuid
): ):
test_encrypted_data = 'some encrypted data' test_encrypted_data = 'some encrypted data'
sample_service.research_mode = True sample_letter_job.service.research_mode = True
csv = """address_line_1,address_line_2,address_line_3,address_line_4,postcode,name csv = """address_line_1,address_line_2,address_line_3,address_line_4,postcode,name
A1,A2,A3,A4,A_POST,Alice A1,A2,A3,A4,A_POST,Alice
@@ -654,7 +654,7 @@ def test_should_update_job_to_sent_to_dvla_in_research_mode_for_letter_job(
persist_letter.apply_async.assert_called_once_with( persist_letter.apply_async.assert_called_once_with(
( (
str(sample_service.id), str(sample_letter_job.service_id),
fake_uuid, fake_uuid,
test_encrypted_data, test_encrypted_data,
datetime.utcnow().strftime(DATETIME_FORMAT) datetime.utcnow().strftime(DATETIME_FORMAT)
@@ -737,8 +737,8 @@ def test_should_not_send_email_if_team_key_and_recipient_not_in_team(sample_emai
def test_should_not_send_sms_if_team_key_and_recipient_not_in_team(notify_db, notify_db_session, mocker): def test_should_not_send_sms_if_team_key_and_recipient_not_in_team(notify_db, notify_db_session, mocker):
assert Notification.query.count() == 0 assert Notification.query.count() == 0
user = create_user(mobile_number="07700 900205") user = create_user(mobile_number="07700 900205")
service = sample_service(notify_db, notify_db_session, user=user, restricted=True) service = create_sample_service(notify_db, notify_db_session, user=user, restricted=True)
template = sample_template(notify_db, notify_db_session, service=service) template = create_sample_template(notify_db, notify_db_session, service=service)
team_members = [user.mobile_number for user in service.users] team_members = [user.mobile_number for user in service.users]
assert "07890 300000" not in team_members assert "07890 300000" not in team_members

8
tests/app/conftest.py
View File

@@ -172,7 +172,13 @@ def sample_service(
@pytest.fixture(scope='function') @pytest.fixture(scope='function')
def sample_service_full_permissions(notify_db, notify_db_session): def sample_service_full_permissions(notify_db, notify_db_session):
return sample_service(notify_db, notify_db_session, permissions=SERVICE_PERMISSION_TYPES) return sample_service(
notify_db,
notify_db_session,
# ensure name doesn't clash with regular sample service
service_name="sample service full permissions",
permissions=SERVICE_PERMISSION_TYPES
)
@pytest.fixture(scope='function') @pytest.fixture(scope='function')

4
tests/app/job/test_rest.py
View File

@@ -187,7 +187,7 @@ def test_create_job_returns_403_if_service_is_not_active(client, fake_uuid, samp
def test_create_job_returns_403_if_letter_template_type_and_service_in_trial( def test_create_job_returns_403_if_letter_template_type_and_service_in_trial(
client, fake_uuid, sample_service, sample_trial_letter_template, mocker): client, fake_uuid, sample_trial_letter_template, mocker):
data = { data = {
'id': fake_uuid, 'id': fake_uuid,
'service': str(sample_trial_letter_template.service.id), 'service': str(sample_trial_letter_template.service.id),
@@ -198,7 +198,7 @@ def test_create_job_returns_403_if_letter_template_type_and_service_in_trial(
} }
mock_job_dao = mocker.patch("app.dao.jobs_dao.dao_create_job") mock_job_dao = mocker.patch("app.dao.jobs_dao.dao_create_job")
auth_header = create_authorization_header() auth_header = create_authorization_header()
response = client.post('/service/{}/job'.format(sample_service.id), response = client.post('/service/{}/job'.format(sample_trial_letter_template.service.id),
data=json.dumps(data), data=json.dumps(data),
headers=[('Content-Type', 'application/json'), auth_header]) headers=[('Content-Type', 'application/json'), auth_header])