darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-03 09:51:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove sample_notification_with_api_key fixture

Browse Source 
This was only used once and was not Pytest 4 compatible.
This commit is contained in:
Katie Smith
2019-09-13 13:26:46 +01:00
parent 09e8ac9644
commit 62735ea125
3 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/app/conftest.py
View File

@@ -628,18 +628,6 @@ def sample_letter_notification(sample_letter_template):
return create_notification(sample_letter_template, reference='foo', personalisation=address) return create_notification(sample_letter_template, reference='foo', personalisation=address)
@pytest.fixture(scope='function')
def sample_notification_with_api_key(notify_db, notify_db_session):
notification = sample_notification(notify_db, notify_db_session)
notification.api_key = sample_api_key(
notify_db,
notify_db_session,
name='Test key'
)
notification.api_key_id = notification.api_key.id
return notification
@pytest.fixture(scope='function') @pytest.fixture(scope='function')
def sample_email_notification(notify_db, notify_db_session): def sample_email_notification(notify_db, notify_db_session):
created_at = datetime.utcnow() created_at = datetime.utcnow()

7
tests/app/db.py
View File

@@ -511,11 +511,14 @@ def create_letter_rate(start_date=None, end_date=None, crown=True, sheet_count=1
return rate return rate
def create_api_key(service, key_type=KEY_TYPE_NORMAL): def create_api_key(service, key_type=KEY_TYPE_NORMAL, key_name=None):
id_ = uuid.uuid4() id_ = uuid.uuid4()
name = key_name if key_name else '{} api key {}'.format(key_type, id_)
api_key = ApiKey( api_key = ApiKey(
service=service, service=service,
name='{} api key {}'.format(key_type, id_), name=name,
created_by=service.created_by, created_by=service.created_by,
key_type=key_type, key_type=key_type,
id=id_, id=id_,

8
tests/app/test_schemas.py
View File

@@ -4,6 +4,7 @@ from sqlalchemy import desc
from app.dao.provider_details_dao import dao_update_provider_details from app.dao.provider_details_dao import dao_update_provider_details
from app.models import ProviderDetailsHistory from app.models import ProviderDetailsHistory
from tests.app.db import create_api_key
def test_job_schema_doesnt_return_notifications(sample_notification_with_job): def test_job_schema_doesnt_return_notifications(sample_notification_with_job):
@@ -25,10 +26,13 @@ def test_notification_schema_ignores_absent_api_key(sample_notification_with_job
assert data['key_name'] is None assert data['key_name'] is None
def test_notification_schema_adds_api_key_name(sample_notification_with_api_key): def test_notification_schema_adds_api_key_name(sample_notification):
from app.schemas import notification_with_template_schema from app.schemas import notification_with_template_schema
data = notification_with_template_schema.dump(sample_notification_with_api_key).data api_key = create_api_key(sample_notification.service, key_name='Test key')
sample_notification.api_key = api_key
data = notification_with_template_schema.dump(sample_notification).data
assert data['key_name'] == 'Test key' assert data['key_name'] == 'Test key'