darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-07 19:38:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replaced first queries with one queries, which throws a NoResultFound.

Browse Source 
Able to remove many of the None checks as a result of this.
Fixed the tests were needed.
This commit is contained in:
Rebecca Law
2016-03-11 15:34:20 +00:00
parent ef5969be77
commit 123b0ead3a
14 changed files with 26 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,9 @@
from datetime import datetime, timedelta
import uuid
import pytest
from sqlalchemy.orm.exc import NoResultFound
from app import db
from app.models import InvitedUser
@@ -50,8 +54,9 @@ def test_get_invited_user_by_id(notify_db, notify_db_session, sample_invited_use
def test_get_unknown_invited_user_returns_none(notify_db, notify_db_session, sample_service):
unknown_id = uuid.uuid4()
unknown = get_invited_user(sample_service.id, unknown_id)
assert unknown is None
with pytest.raises(NoResultFound) as e:
get_invited_user(sample_service.id, unknown_id)
assert 'No row was found for one()' in str(e.value)
def test_get_invited_users_for_service(notify_db, notify_db_session, sample_service):

4
tests/app/dao/test_services_dao.py
View File

@@ -171,4 +171,6 @@ def test_cannot_get_service_by_id_and_owned_by_different_user(service_factory, s
save_model_user(new_user)
service2 = service_factory.get('service 2', new_user)
assert dao_fetch_service_by_id_and_user(service1.id, sample_user.id).name == 'service 1'
assert not dao_fetch_service_by_id_and_user(service2.id, sample_user.id)
with pytest.raises(NoResultFound) as e:
dao_fetch_service_by_id_and_user(service2.id, sample_user.id)
assert 'No row was found for one()' in str(e)