darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-19 14:09:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update service_id to a UUID from an integer.

Browse Source 
This commit must go along side a commit on the notifications-api app.
There will be a breif outage until both app are deployed.
This commit is contained in:
Rebecca Law
2016-02-02 14:24:08 +00:00
parent e1a0460624
commit a4cb35ad3b
10 changed files with 59 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/conftest.py
View File

@@ -30,7 +30,8 @@ def app_(request):
@pytest.fixture(scope='function')
def service_one(request, api_user_active):
return service_json(1, 'service one', [api_user_active.id])
import uuid
return service_json(str(uuid.uuid4()), 'service one', [api_user_active.id])
@pytest.fixture(scope='function')
@@ -89,10 +90,11 @@ def mock_get_services(mocker, user=None):
user = api_user_active()
def _create(user_id=None):
import uuid
service_one = service_json(
1, "service_one", [user.id], 1000, True, False)
uuid.uuid4(), "service_one", [user.id], 1000, True, False)
service_two = service_json(
2, "service_two", [user.id], 1000, True, False)
uuid.uuid4(), "service_two", [user.id], 1000, True, False)
return {'data': [service_one, service_two]}
return mocker.patch(