Rebased migrations, all tests working.

This commit is contained in:
Nicholas Staples
2016-04-08 13:34:46 +01:00
parent 2abdad8d20
commit c4b316bde6
67 changed files with 392 additions and 1850 deletions

View File

@@ -22,7 +22,7 @@ def test_get_permission_list(notify_api, notify_db, notify_db_session, sample_pe
assert len(json_resp['data']) == 1
expected = {
"permission": sample_permission.permission,
"user": sample_permission.user.id,
"user": str(sample_permission.user.id),
"id": str(sample_permission.id),
"service": None
}
@@ -52,7 +52,7 @@ def test_get_permission_filter(notify_api,
service_id=str(sample_service.id)).first()
expected = {
"permission": another_permission.permission,
"user": sample_user.id,
"user": str(sample_user.id),
"id": str(another_permission.id),
"service": str(sample_service.id)
}
@@ -75,7 +75,7 @@ def test_get_permission(notify_api, notify_db, notify_db_session, sample_permiss
json_resp = json.loads(response.get_data(as_text=True))
expected = {
"permission": sample_permission.permission,
"user": sample_permission.user.id,
"user": str(sample_permission.user.id),
"id": str(sample_permission.id),
"service": None
}