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

Merge pull request #2005 from charltonaustin/fix_spacing_for_motd

Browse source 
Moving the messages endpoint to something more generic, and making th…
This commit is contained in:
Charlton Austin 2016-10-17 17:21:03 -04:00 • committed by GitHub
commit f45aac063e
7 changed files with 120 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

7
test/test_api_security.py
View file

@ -51,7 +51,8 @@ from endpoints.api.superuser import (SuperUserLogs, SuperUserList, SuperUserMana
SuperUserOrganizationManagement, SuperUserOrganizationList,
SuperUserAggregateLogs, SuperUserServiceKeyManagement,
SuperUserServiceKey, SuperUserServiceKeyApproval,
SuperUserTakeOwnership, SuperUserMessages, SuperUserMessage)
SuperUserTakeOwnership,)
from endpoints.api.globalmessages import (GlobalUserMessage, GlobalUserMessages,)
from endpoints.api.secscan import RepositoryImageSecurity
from endpoints.api.manifest import RepositoryManifestLabels, ManageRepositoryManifestLabel
@ -4204,7 +4205,7 @@ class TestSuperUserManagement(ApiTestCase):
class TestSuperUserMessages(ApiTestCase):
def setUp(self):
ApiTestCase.setUp(self)
self._set_url(SuperUserMessages, username='freshuser')
self._set_url(GlobalUserMessages, username='freshuser')
def test_get_anonymous(self):
self._run_test('GET', 200, None, None)
@ -4235,7 +4236,7 @@ class TestSuperUserMessages(ApiTestCase):
class TestSuperUserMessage(ApiTestCase):
def setUp(self):
ApiTestCase.setUp(self)
self._set_url(SuperUserMessage, uuid='1234')
self._set_url(GlobalUserMessage, uuid='1234')
def test_delete_anonymous(self):
self._run_test('DELETE', 401, None, None)

14
test/test_api_usage.py
View file

@ -65,8 +65,8 @@ from endpoints.api.permission import (RepositoryUserPermission, RepositoryTeamPe
RepositoryTeamPermissionList, RepositoryUserPermissionList)
from endpoints.api.superuser import (SuperUserLogs, SuperUserList, SuperUserManagement,
SuperUserServiceKeyManagement, SuperUserServiceKey,
SuperUserServiceKeyApproval, SuperUserTakeOwnership,
SuperUserMessages, SuperUserMessage)
SuperUserServiceKeyApproval, SuperUserTakeOwnership,)
from endpoints.api.globalmessages import (GlobalUserMessage, GlobalUserMessages,)
from endpoints.api.secscan import RepositoryImageSecurity
from endpoints.api.suconfig import (SuperUserRegistryStatus, SuperUserConfig, SuperUserConfigFile,
SuperUserCreateInitialSuperUser)
@ -4283,9 +4283,9 @@ class TestSuperUserManagement(ApiTestCase):
self.login(ADMIN_ACCESS_USER)
# Create a message
self.postResponse(SuperUserMessages, data=dict(message={"content": "new message"}), expected_code=201)
self.postResponse(GlobalUserMessages, data=dict(message={"content": "new message"}), expected_code=201)
json = self.getJsonResponse(SuperUserMessages)
json = self.getJsonResponse(GlobalUserMessages)
self.assertEquals(len(json['messages']), 2)
self.assertEquals(json['messages'][1]["content"], "new message")
@ -4294,10 +4294,10 @@ class TestSuperUserManagement(ApiTestCase):
def test_delete_message(self):
self.login(ADMIN_ACCESS_USER)
json = self.getJsonResponse(SuperUserMessages)
self.deleteResponse(SuperUserMessage, {"uuid": json['messages'][0]['uuid']}, 204)
json = self.getJsonResponse(GlobalUserMessages)
self.deleteResponse(GlobalUserMessage, {"uuid": json['messages'][0]['uuid']}, 204)
json = self.getJsonResponse(SuperUserMessages)
json = self.getJsonResponse(GlobalUserMessages)
self.assertEquals(len(json['messages']), 0)