vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix schema for invoice email updating

Browse source 
Fixes #1209
This commit is contained in:
Joseph Schorr 2016-02-16 11:52:57 -05:00
parent babf61fdaa
commit ecaa051791
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
endpoints/api/organization.py
View file

@ -121,7 +121,7 @@ class Organization(ApiResource):
'description': 'Whether the organization desires to receive emails for invoices', 'description': 'Whether the organization desires to receive emails for invoices',
}, },
'invoice_email_address': { 'invoice_email_address': {
'type': 'string', 'type': ['string', 'null'],
'description': 'The email address at which to receive invoices', 'description': 'The email address at which to receive invoices',
}, },
'tag_expiration': { 'tag_expiration': {

2
endpoints/api/user.py
View file

@ -199,7 +199,7 @@ class User(ApiResource):
'description': 'The user\'s username', 'description': 'The user\'s username',
}, },
'invoice_email_address': { 'invoice_email_address': {
'type': 'string', 'type': ['string', 'null'],
'description': 'Custom email address for receiving invoices', 'description': 'Custom email address for receiving invoices',
} }
}, },

9
test/test_api_usage.py
View file

@ -46,7 +46,7 @@ from endpoints.api.organization import (OrganizationList, OrganizationMember,
OrgPrivateRepositories, OrganizationMemberList, OrgPrivateRepositories, OrganizationMemberList,
Organization, ApplicationInformation, Organization, ApplicationInformation,
OrganizationApplications, OrganizationApplicationResource, OrganizationApplications, OrganizationApplicationResource,
OrganizationApplicationResetClientSecret) OrganizationApplicationResetClientSecret, Organization)
from endpoints.api.repository import RepositoryList, RepositoryVisibility, Repository from endpoints.api.repository import RepositoryList, RepositoryVisibility, Repository
from endpoints.api.permission import (RepositoryUserPermission, RepositoryTeamPermission, from endpoints.api.permission import (RepositoryUserPermission, RepositoryTeamPermission,
RepositoryTeamPermissionList, RepositoryUserPermissionList) RepositoryTeamPermissionList, RepositoryUserPermissionList)
@ -2890,6 +2890,13 @@ class TestOrganizationApplicationResource(ApiTestCase):
expected_code=404) expected_code=404)
class TestOrganization(ApiTestCase):
def test_change_send_billing_invoice(self):
self.login(ADMIN_ACCESS_USER)
self.putJsonResponse(Organization, params=dict(orgname=ORGANIZATION),
data=dict(invoice_email=False, invoice_email_address=None))
class TestOrganizationApplicationResetClientSecret(ApiTestCase): class TestOrganizationApplicationResetClientSecret(ApiTestCase):
def test_reset_client_secret(self): def test_reset_client_secret(self):
self.login(ADMIN_ACCESS_USER) self.login(ADMIN_ACCESS_USER)