Fix bug in PermissionDAO

Refactor user/test_rest
Remove conftest/sample_admin_service
This commit is contained in:
Rebecca Law
2016-03-01 10:34:27 +00:00
parent 5aa2243e81
commit ecbfbbc6b0
3 changed files with 82 additions and 123 deletions

View File

@@ -237,16 +237,6 @@ def sample_email_job(notify_db,
return job
@pytest.fixture(scope='function')
def sample_admin_service_id(notify_db, notify_db_session):
admin_user = sample_user(notify_db, notify_db_session, email="notify_admin@digital.cabinet-office.gov.uk")
admin_service = sample_service(notify_db, notify_db_session, service_name="Sample Admin Service", user=admin_user)
data = {'service': admin_service, 'name': 'sample admin key'}
api_key = ApiKey(**data)
save_model_api_key(api_key)
return admin_service.id
@pytest.fixture(scope='function')
def mock_secret_code(mocker):
def _create():