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

Stop calling fixtures as functions in the tests

Browse Source
This commit is contained in:
Katie Smith
2019-10-30 10:51:07 +00:00
parent fb875c50c1
commit 38243cf860
11 changed files with 75 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/app/dao/notification_dao/test_notification_dao.py
View File

@@ -411,9 +411,8 @@ def test_save_notification_and_increment_job(sample_template, sample_job, mmg_pr
def test_save_notification_and_increment_correct_job(notify_db, notify_db_session, sample_template, mmg_provider):
from tests.app.conftest import sample_job
job_1 = sample_job(notify_db, notify_db_session, sample_template.service)
job_2 = sample_job(notify_db, notify_db_session, sample_template.service)
job_1 = create_job(sample_template)
job_2 = create_job(sample_template)
assert Notification.query.count() == 0
data = _notification_json(sample_template, job_id=job_1.id)

7
tests/app/dao/test_invited_user_dao.py
View File

@@ -15,6 +15,7 @@ from app.dao.invited_user_dao import (
get_invited_user_by_id,
delete_invitations_created_more_than_two_days_ago
)
from tests.app.db import create_invited_user
def test_create_invited_user(notify_db, notify_db_session, sample_service):
@@ -84,15 +85,11 @@ def test_get_unknown_invited_user_returns_none(notify_db, notify_db_session, sam
def test_get_invited_users_for_service(notify_db, notify_db_session, sample_service):
from tests.app.conftest import sample_invited_user
invites = []
for i in range(0, 5):
email = 'invited_user_{}@service.gov.uk'.format(i)
invited_user = sample_invited_user(notify_db,
notify_db_session,
sample_service,
email)
invited_user = create_invited_user(sample_service, to_email_address=email)
invites.append(invited_user)
all_from_db = get_invited_users_for_service(sample_service.id)

11
tests/app/dao/test_permissions_dao.py
View File

@@ -1,5 +1,5 @@
from app.dao.permissions_dao import permission_dao
from tests.app.conftest import sample_service as create_service
from tests.app.db import create_service
def test_get_permissions_by_user_id_returns_all_permissions(sample_service):
@@ -15,11 +15,10 @@ def test_get_permissions_by_user_id_returns_all_permissions(sample_service):
"view_activity"]) == sorted([i.permission for i in permissions])
def test_get_permissions_by_user_id_returns_only_active_service(notify_db, notify_db_session, sample_user):
active_service = create_service(notify_db, notify_db_session, service_name="Active service", user=sample_user)
inactive_service = create_service(notify_db, notify_db_session, service_name="Inactive service",
user=sample_user)
inactive_service.active = False
def test_get_permissions_by_user_id_returns_only_active_service(sample_user):
active_service = create_service(user=sample_user, service_name="Active service")
inactive_service = create_service(user=sample_user, service_name="Inactive service", active=False)
permissions = permission_dao.get_permissions_by_user_id(user_id=sample_user.id)
assert len(permissions) == 8
assert active_service in [i.service for i in permissions]

7
tests/app/dao/test_service_whitelist_dao.py
View File

@@ -10,8 +10,7 @@ from app.dao.service_whitelist_dao import (
dao_add_and_commit_whitelisted_contacts,
dao_remove_service_whitelist
)
from tests.app.conftest import sample_service as create_service
from tests.app.db import create_service
def test_fetch_service_whitelist_gets_whitelists(sample_service_whitelist):
@@ -35,8 +34,8 @@ def test_add_and_commit_whitelisted_contacts_saves_data(sample_service):
def test_remove_service_whitelist_only_removes_for_my_service(notify_db, notify_db_session):
service_1 = create_service(notify_db, notify_db_session, service_name="service 1")
service_2 = create_service(notify_db, notify_db_session, service_name="service 2")
service_1 = create_service(service_name="service 1")
service_2 = create_service(service_name="service 2")
dao_add_and_commit_whitelisted_contacts([
ServiceWhitelist.from_string(service_1.id, EMAIL_TYPE, 'service1@example.com'),
ServiceWhitelist.from_string(service_2.id, EMAIL_TYPE, 'service2@example.com')