From 5e7ffd95ca0198583afc515f05cbf6f2ea56add7 Mon Sep 17 00:00:00 2001 From: jakedt Date: Tue, 18 Mar 2014 19:34:26 -0400 Subject: [PATCH] Update the api usage test to use the new url_for resources. --- test/test_api_usage.py | 376 ++++++++++++++++++++++------------------- 1 file changed, 199 insertions(+), 177 deletions(-) diff --git a/test/test_api_usage.py b/test/test_api_usage.py index 04a999f1d..dd85a74da 100644 --- a/test/test_api_usage.py +++ b/test/test_api_usage.py @@ -1,15 +1,38 @@ import unittest import json as py_json -from flask import url_for -from endpoints.api import api +from endpoints.api import api_bp, api from endpoints.webhooks import webhooks from endpoints.trigger import BuildTrigger from app import app from initdb import setup_database_for_testing, finished_database_for_testing from data import model, database -app.register_blueprint(api, url_prefix='/api') +from endpoints.api.team import TeamMember, TeamMemberList, OrganizationTeam +from endpoints.api.tag import RepositoryTagImages, RepositoryTag +from endpoints.api.search import FindRepositories, EntitySearch +from endpoints.api.image import RepositoryImage, RepositoryImageList +from endpoints.api.build import RepositoryBuildStatus, RepositoryBuildLogs, RepositoryBuildList +from endpoints.api.robot import UserRobotList, OrgRobot, OrgRobotList, UserRobot +from endpoints.api.trigger import (BuildTriggerActivate, BuildTriggerSources, BuildTriggerSubdirs, + TriggerBuildList, ActivateBuildTrigger, BuildTrigger, + BuildTriggerList) +from endpoints.api.webhook import Webhook, WebhookList +from endpoints.api.user import PrivateRepositories, ConvertToOrganization, Signout, Signin, User +from endpoints.api.repotoken import RepositoryToken, RepositoryTokenList +from endpoints.api.prototype import PermissionPrototype, PermissionPrototypeList +from endpoints.api.logs import UserLogs, OrgLogs +from endpoints.api.billing import (UserCard, UserPlan, ListPlans, OrganizationCard, + OrganizationPlan) +from endpoints.api.discovery import DiscoveryResource +from endpoints.api.organization import (OrganizationList, OrganizationMember, + OrgPrivateRepositories, OrgnaizationMemberList, + Organization) +from endpoints.api.repository import RepositoryList, RepositoryVisibility, Repository +from endpoints.api.permission import (RepositoryUserPermission, RepositoryTeamPermission, + RepositoryTeamPermissionList, RepositoryUserPermissionList) + +app.register_blueprint(api_bp, url_prefix='/api') app.register_blueprint(webhooks, url_prefix='/webhooks') NO_ACCESS_USER = 'freshuser' @@ -39,51 +62,52 @@ class ApiTestCase(unittest.TestCase): finished_database_for_testing(self) self.ctx.__exit__(True, None, None) - def getJsonResponse(self, method_name, params={}): - rv = self.app.get(url_for(method_name, **params)) + def getJsonResponse(self, resource_name, params={}): + rv = self.app.get(api.url_for(resource_name, **params)) self.assertEquals(200, rv.status_code) data = rv.data parsed = py_json.loads(data) return parsed - def postResponse(self, method_name, params={}, data={}, expected_code=200): - rv = self.app.post(url_for(method_name, **params), + def postResponse(self, resource_name, params={}, data={}, expected_code=200): + rv = self.app.post(api.url_for(resource_name, **params), data=py_json.dumps(data), headers={"Content-Type": "application/json"}) self.assertEquals(rv.status_code, expected_code) return rv.data - def getResponse(self, method_name, params={}, expected_code=200): - rv = self.app.get(url_for(method_name, **params)) + def getResponse(self, resource_name, params={}, expected_code=200): + rv = self.app.get(api.url_for(resource_name, **params)) self.assertEquals(rv.status_code, expected_code) return rv.data - def deleteResponse(self, method_name, params={}, expected_code=204): - rv = self.app.delete(url_for(method_name, **params)) + def deleteResponse(self, resource_name, params={}, expected_code=204): + rv = self.app.delete(api.url_for(resource_name, **params)) self.assertEquals(rv.status_code, expected_code) return rv.data - def postJsonResponse(self, method_name, params={}, data={}, + def postJsonResponse(self, resource_name, params={}, data={}, expected_code=200): - rv = self.app.post(url_for(method_name, **params), + rv = self.app.post(api.url_for(resource_name, **params), data=py_json.dumps(data), headers={"Content-Type": "application/json"}) if rv.status_code != expected_code: - print 'Mismatch data for method %s: %s' % (method_name, rv.data) + print 'Mismatch data for resource POST %s: %s' % (resource_name, rv.data) self.assertEquals(rv.status_code, expected_code) data = rv.data parsed = py_json.loads(data) return parsed - def putJsonResponse(self, method_name, params={}, data={}, + def putJsonResponse(self, resource_name, params={}, data={}, expected_code=200): - rv = self.app.put(url_for(method_name, **params), data=py_json.dumps(data), + rv = self.app.put(api.url_for(resource_name, **params), + data=py_json.dumps(data), headers={"Content-Type": "application/json"}) if rv.status_code != expected_code: - print 'Mismatch data for method %s: %s' % (method_name, rv.data) + print 'Mismatch data for resource PUT %s: %s' % (resource_name, rv.data) self.assertEquals(rv.status_code, expected_code) data = rv.data @@ -91,14 +115,12 @@ class ApiTestCase(unittest.TestCase): return parsed def login(self, username, password='password'): - return self.postJsonResponse('api.signin_user', - data=dict(username=username, - password=password)) + return self.postJsonResponse(Signin, data=dict(username=username, password=password)) class TestDiscovery(ApiTestCase): def test_discovery(self): - json = self.getJsonResponse('api.discovery') + json = self.getJsonResponse(DiscoveryResource) found = set([]) for method_info in json['endpoints']: found.add(method_info['name']) @@ -108,7 +130,7 @@ class TestDiscovery(ApiTestCase): class TestPlans(ApiTestCase): def test_plans(self): - json = self.getJsonResponse('api.list_plans') + json = self.getJsonResponse(ListPlans) found = set([]) for method_info in json['plans']: found.add(method_info['stripeId']) @@ -118,12 +140,12 @@ class TestPlans(ApiTestCase): class TestLoggedInUser(ApiTestCase): def test_guest(self): - json = self.getJsonResponse('api.get_logged_in_user') + json = self.getJsonResponse(User) assert json['anonymous'] == True def test_user(self): self.login(READ_ACCESS_USER) - json = self.getJsonResponse('api.get_logged_in_user') + json = self.getJsonResponse(User) assert json['anonymous'] == False assert json['username'] == READ_ACCESS_USER @@ -131,13 +153,13 @@ class TestLoggedInUser(ApiTestCase): class TestGetUserPrivateAllowed(ApiTestCase): def test_nonallowed(self): self.login(READ_ACCESS_USER) - json = self.getJsonResponse('api.get_user_private_allowed') + json = self.getJsonResponse(PrivateRepositories) assert json['privateCount'] == 0 assert not json['privateAllowed'] def test_allowed(self): self.login(ADMIN_ACCESS_USER) - json = self.getJsonResponse('api.get_user_private_allowed') + json = self.getJsonResponse(PrivateRepositories) assert json['privateCount'] == 6 assert json['privateAllowed'] @@ -145,7 +167,7 @@ class TestGetUserPrivateAllowed(ApiTestCase): class TestConvertToOrganization(ApiTestCase): def test_sameadminuser(self): self.login(READ_ACCESS_USER) - json = self.postJsonResponse('api.convert_user_to_organization', + json = self.postJsonResponse(ConvertToOrganization, data={'adminUser': READ_ACCESS_USER, 'adminPassword': 'password'}, expected_code=400) @@ -154,7 +176,7 @@ class TestConvertToOrganization(ApiTestCase): def test_invalidadminuser(self): self.login(READ_ACCESS_USER) - json = self.postJsonResponse('api.convert_user_to_organization', + json = self.postJsonResponse(ConvertToOrganization, data={'adminUser': 'unknownuser', 'adminPassword': 'password'}, expected_code=400) @@ -164,7 +186,7 @@ class TestConvertToOrganization(ApiTestCase): def test_invalidadminpassword(self): self.login(READ_ACCESS_USER) - json = self.postJsonResponse('api.convert_user_to_organization', + json = self.postJsonResponse(ConvertToOrganization, data={'adminUser': ADMIN_ACCESS_USER, 'adminPassword': 'invalidpass'}, expected_code=400) @@ -174,7 +196,7 @@ class TestConvertToOrganization(ApiTestCase): def test_convert(self): self.login(READ_ACCESS_USER) - json = self.postJsonResponse('api.convert_user_to_organization', + json = self.postJsonResponse(ConvertToOrganization, data={'adminUser': ADMIN_ACCESS_USER, 'adminPassword': 'password', 'plan': 'free'}) @@ -187,7 +209,7 @@ class TestConvertToOrganization(ApiTestCase): # Verify the admin user is the org's admin. self.login(ADMIN_ACCESS_USER) - json = self.getJsonResponse('api.get_organization', + json = self.getJsonResponse(Organization, params=dict(orgname=READ_ACCESS_USER)) self.assertEquals(READ_ACCESS_USER, json['name']) @@ -197,25 +219,25 @@ class TestConvertToOrganization(ApiTestCase): class TestChangeUserDetails(ApiTestCase): def test_changepassword(self): self.login(READ_ACCESS_USER) - self.putJsonResponse('api.change_user_details', + self.putJsonResponse(User, data=dict(password='newpasswordiscool')) self.login(READ_ACCESS_USER, password='newpasswordiscool') def test_changeinvoiceemail(self): self.login(READ_ACCESS_USER) - json = self.putJsonResponse('api.change_user_details', + json = self.putJsonResponse(User, data=dict(invoice_email=True)) self.assertEquals(True, json['invoice_email']) - json = self.putJsonResponse('api.change_user_details', + json = self.putJsonResponse(User, data=dict(invoice_email=False)) self.assertEquals(False, json['invoice_email']) class TestCreateNewUser(ApiTestCase): def test_existingusername(self): - json = self.postJsonResponse('api.create_new_user', + json = self.postJsonResponse(User, data=dict(username=READ_ACCESS_USER, password='password', email='test@example.com'), @@ -224,7 +246,7 @@ class TestCreateNewUser(ApiTestCase): self.assertEquals('The username already exists', json['message']) def test_createuser(self): - data = self.postResponse('api.create_new_user', + data = self.postResponse(User, data=NEW_USER_DETAILS, expected_code=201) self.assertEquals('Created', data) @@ -234,12 +256,12 @@ class TestSignout(ApiTestCase): def test_signout(self): self.login(READ_ACCESS_USER) - json = self.getJsonResponse('api.get_logged_in_user') + json = self.getJsonResponse(User) assert json['username'] == READ_ACCESS_USER - self.postResponse('api.logout') + self.postResponse(Signout) - json = self.getJsonResponse('api.get_logged_in_user') + json = self.getJsonResponse(User) assert json['anonymous'] == True @@ -247,7 +269,7 @@ class TestGetMatchingEntities(ApiTestCase): def test_notinorg(self): self.login(NO_ACCESS_USER) - json = self.getJsonResponse('api.get_matching_entities', + json = self.getJsonResponse(EntitySearch, params=dict(prefix='o', namespace=ORGANIZATION, includeTeams='true')) @@ -258,7 +280,7 @@ class TestGetMatchingEntities(ApiTestCase): def test_inorg(self): self.login(ADMIN_ACCESS_USER) - json = self.getJsonResponse('api.get_matching_entities', + json = self.getJsonResponse(EntitySearch, params=dict(prefix='o', namespace=ORGANIZATION, includeTeams='true')) @@ -271,7 +293,7 @@ class TestCreateOrganization(ApiTestCase): def test_existinguser(self): self.login(ADMIN_ACCESS_USER) - json = self.postJsonResponse('api.create_organization', + json = self.postJsonResponse(OrganizationList, data=dict(name=ADMIN_ACCESS_USER), expected_code=400) @@ -281,7 +303,7 @@ class TestCreateOrganization(ApiTestCase): def test_existingorg(self): self.login(ADMIN_ACCESS_USER) - json = self.postJsonResponse('api.create_organization', + json = self.postJsonResponse(OrganizationList, data=dict(name=ORGANIZATION), expected_code=400) @@ -291,7 +313,7 @@ class TestCreateOrganization(ApiTestCase): def test_createorg(self): self.login(ADMIN_ACCESS_USER) - data = self.postResponse('api.create_organization', + data = self.postResponse(OrganizationList, data=dict(name='neworg', email='test@example.com'), expected_code=201) @@ -303,7 +325,7 @@ class TestCreateOrganization(ApiTestCase): assert organization is not None # Verify the admin user is the org's admin. - json = self.getJsonResponse('api.get_organization', + json = self.getJsonResponse(Organization, params=dict(orgname='neworg')) self.assertEquals('neworg', json['name']) self.assertEquals(True, json['is_admin']) @@ -312,17 +334,17 @@ class TestCreateOrganization(ApiTestCase): class TestGetOrganization(ApiTestCase): def test_unknownorg(self): self.login(ADMIN_ACCESS_USER) - self.getResponse('api.get_organization', params=dict(orgname='notvalid'), + self.getResponse(Organization, params=dict(orgname='notvalid'), expected_code=403) def test_cannotaccess(self): self.login(NO_ACCESS_USER) - self.getResponse('api.get_organization', params=dict(orgname=ORGANIZATION), + self.getResponse(Organization, params=dict(orgname=ORGANIZATION), expected_code=403) def test_getorganization(self): self.login(READ_ACCESS_USER) - json = self.getJsonResponse('api.get_organization', + json = self.getJsonResponse(Organization, params=dict(orgname=ORGANIZATION)) self.assertEquals(ORGANIZATION, json['name']) @@ -330,7 +352,7 @@ class TestGetOrganization(ApiTestCase): def test_getorganization_asadmin(self): self.login(ADMIN_ACCESS_USER) - json = self.getJsonResponse('api.get_organization', + json = self.getJsonResponse(Organization, params=dict(orgname=ORGANIZATION)) self.assertEquals(ORGANIZATION, json['name']) @@ -341,13 +363,13 @@ class TestChangeOrganizationDetails(ApiTestCase): def test_changeinvoiceemail(self): self.login(ADMIN_ACCESS_USER) - json = self.putJsonResponse('api.change_organization_details', + json = self.putJsonResponse(Organization, params=dict(orgname=ORGANIZATION), data=dict(invoice_email=True)) self.assertEquals(True, json['invoice_email']) - json = self.putJsonResponse('api.change_organization_details', + json = self.putJsonResponse(Organization, params=dict(orgname=ORGANIZATION), data=dict(invoice_email=False)) self.assertEquals(False, json['invoice_email']) @@ -356,7 +378,7 @@ class TestChangeOrganizationDetails(ApiTestCase): def test_changemail(self): self.login(ADMIN_ACCESS_USER) - json = self.putJsonResponse('api.change_organization_details', + json = self.putJsonResponse(Organization, params=dict(orgname=ORGANIZATION), data=dict(email='newemail@example.com')) @@ -366,7 +388,7 @@ class TestChangeOrganizationDetails(ApiTestCase): class TestGetOrganizationPrototypes(ApiTestCase): def test_getprototypes(self): self.login(ADMIN_ACCESS_USER) - json = self.getJsonResponse('api.get_organization_prototype_permissions', + json = self.getJsonResponse(PermissionPrototypeList, params=dict(orgname=ORGANIZATION)) assert len(json['prototypes']) > 0 @@ -376,7 +398,7 @@ class TestCreateOrganizationPrototypes(ApiTestCase): def test_invaliduser(self): self.login(ADMIN_ACCESS_USER) - json = self.postJsonResponse('api.create_organization_prototype_permission', + json = self.postJsonResponse(PermissionPrototypeList, params=dict(orgname=ORGANIZATION), data=dict(activating_user={'name': 'unknownuser'}, role='read', @@ -389,7 +411,7 @@ class TestCreateOrganizationPrototypes(ApiTestCase): def test_missingdelegate(self): self.login(ADMIN_ACCESS_USER) - json = self.postJsonResponse('api.create_organization_prototype_permission', + json = self.postJsonResponse(PermissionPrototypeList, params=dict(orgname=ORGANIZATION), data=dict(role='read'), expected_code=400) @@ -399,7 +421,7 @@ class TestCreateOrganizationPrototypes(ApiTestCase): def test_createprototype(self): self.login(ADMIN_ACCESS_USER) - json = self.postJsonResponse('api.create_organization_prototype_permission', + json = self.postJsonResponse(PermissionPrototypeList, params=dict(orgname=ORGANIZATION), data=dict(role='read', delegate={'kind': 'team', @@ -409,7 +431,7 @@ class TestCreateOrganizationPrototypes(ApiTestCase): pid = json['id'] # Verify the prototype exists. - json = self.getJsonResponse('api.get_organization_prototype_permissions', + json = self.getJsonResponse(PermissionPrototypeList, params=dict(orgname=ORGANIZATION)) ids = set([p['id'] for p in json['prototypes']]) @@ -421,18 +443,18 @@ class TestDeleteOrganizationPrototypes(ApiTestCase): self.login(ADMIN_ACCESS_USER) # Get the existing prototypes - json = self.getJsonResponse('api.get_organization_prototype_permissions', + json = self.getJsonResponse(PermissionPrototypeList, params=dict(orgname=ORGANIZATION)) ids = [p['id'] for p in json['prototypes']] pid = ids[0] # Delete a prototype. - self.deleteResponse('api.delete_organization_prototype_permission', + self.deleteResponse(PermissionPrototype, params=dict(orgname=ORGANIZATION, prototypeid=pid)) # Verify the prototype no longer exists. - json = self.getJsonResponse('api.get_organization_prototype_permissions', + json = self.getJsonResponse(PermissionPrototypeList, params=dict(orgname=ORGANIZATION)) newids = [p['id'] for p in json['prototypes']] @@ -444,14 +466,14 @@ class TestUpdateOrganizationPrototypes(ApiTestCase): self.login(ADMIN_ACCESS_USER) # Get the existing prototypes - json = self.getJsonResponse('api.get_organization_prototype_permissions', + json = self.getJsonResponse(PermissionPrototypeList, params=dict(orgname=ORGANIZATION)) ids = [p['id'] for p in json['prototypes']] pid = ids[0] # Update a prototype. - json = self.putJsonResponse('api.delete_organization_prototype_permission', + json = self.putJsonResponse(PermissionPrototype, params=dict(orgname=ORGANIZATION, prototypeid=pid), data=dict(role='admin')) @@ -462,7 +484,7 @@ class TestGetOrganiaztionMembers(ApiTestCase): def test_getmembers(self): self.login(ADMIN_ACCESS_USER) - json = self.getJsonResponse('api.get_organization_members', + json = self.getJsonResponse(OrgnaizationMemberList, params=dict(orgname=ORGANIZATION)) assert ADMIN_ACCESS_USER in json['members'] @@ -472,7 +494,7 @@ class TestGetOrganiaztionMembers(ApiTestCase): def test_getspecificmember(self): self.login(ADMIN_ACCESS_USER) - json = self.getJsonResponse('api.get_organization_member', + json = self.getJsonResponse(OrganizationMember, params=dict(orgname=ORGANIZATION, membername=ADMIN_ACCESS_USER)) @@ -486,7 +508,7 @@ class TestGetOrganizationPrivateAllowed(ApiTestCase): def test_existingorg(self): self.login(ADMIN_ACCESS_USER) - json = self.getJsonResponse('api.get_organization_private_allowed', + json = self.getJsonResponse(OrgPrivateRepositories, params=dict(orgname=ORGANIZATION)) self.assertEquals(True, json['privateAllowed']) @@ -496,12 +518,12 @@ class TestGetOrganizationPrivateAllowed(ApiTestCase): def test_neworg(self): self.login(ADMIN_ACCESS_USER) - data = self.postResponse('api.create_organization', + data = self.postResponse(OrganizationList, data=dict(name='neworg', email='test@example.com'), expected_code=201) - json = self.getJsonResponse('api.get_organization_private_allowed', + json = self.getJsonResponse(OrgPrivateRepositories, params=dict(orgname='neworg')) self.assertEquals(False, json['privateAllowed']) @@ -511,7 +533,7 @@ class TestUpdateOrganizationTeam(ApiTestCase): def test_updateexisting(self): self.login(ADMIN_ACCESS_USER) - data = self.postJsonResponse('api.update_organization_team', + data = self.postJsonResponse(OrganizationTeam, params=dict(orgname=ORGANIZATION, teamname='readers'), data=dict(description='My cool team', @@ -523,7 +545,7 @@ class TestUpdateOrganizationTeam(ApiTestCase): def test_attemptchangeroleonowners(self): self.login(ADMIN_ACCESS_USER) - self.postResponse('api.update_organization_team', + self.postResponse(OrganizationTeam, params=dict(orgname=ORGANIZATION, teamname='owners'), data=dict(role = 'creator'), expected_code=400) @@ -531,7 +553,7 @@ class TestUpdateOrganizationTeam(ApiTestCase): def test_createnewteam(self): self.login(ADMIN_ACCESS_USER) - data = self.putJsonResponse('api.update_organization_team', + data = self.putJsonResponse(OrganizationTeam, params=dict(orgname=ORGANIZATION, teamname='newteam'), data=dict(description='My cool team', @@ -542,7 +564,7 @@ class TestUpdateOrganizationTeam(ApiTestCase): self.assertEquals('member', data['role']) # Verify the team was created. - json = self.getJsonResponse('api.get_organization', + json = self.getJsonResponse(Organization, params=dict(orgname=ORGANIZATION)) assert 'newteam' in json['teams'] @@ -551,18 +573,18 @@ class TestDeleteOrganizationTeam(ApiTestCase): def test_deleteteam(self): self.login(ADMIN_ACCESS_USER) - self.deleteResponse('api.delete_organization_team', + self.deleteResponse(OrganizationTeam, params=dict(orgname=ORGANIZATION, teamname='readers')) # Make sure the team was deleted - json = self.getJsonResponse('api.get_organization', + json = self.getJsonResponse(Organization, params=dict(orgname=ORGANIZATION)) assert not 'readers' in json['teams'] def test_attemptdeleteowners(self): self.login(ADMIN_ACCESS_USER) - self.deleteResponse('api.delete_organization_team', + self.deleteResponse(OrganizationTeam, params=dict(orgname=ORGANIZATION, teamname='owners'), expected_code=400) @@ -571,14 +593,14 @@ class TestGetOrganizationTeamMembers(ApiTestCase): def test_invalidteam(self): self.login(ADMIN_ACCESS_USER) - self.getResponse('api.get_organization_team_members', + self.getResponse(TeamMemberList, params=dict(orgname=ORGANIZATION, teamname='notvalid'), expected_code=404) def test_getmembers(self): self.login(ADMIN_ACCESS_USER) - json = self.getJsonResponse('api.get_organization_team_members', + json = self.getJsonResponse(TeamMemberList, params=dict(orgname=ORGANIZATION, teamname='readers')) @@ -589,13 +611,13 @@ class TestUpdateOrganizationTeamMember(ApiTestCase): def test_addmember(self): self.login(ADMIN_ACCESS_USER) - self.postJsonResponse('api.update_organization_team_member', + self.postJsonResponse(TeamMember, params=dict(orgname=ORGANIZATION, teamname='readers', membername=NO_ACCESS_USER)) # Verify the user was added to the team. - json = self.getJsonResponse('api.get_organization_team_members', + json = self.getJsonResponse(TeamMemberList, params=dict(orgname=ORGANIZATION, teamname='readers')) @@ -606,13 +628,13 @@ class TestDeleteOrganizationTeamMember(ApiTestCase): def test_deletemember(self): self.login(ADMIN_ACCESS_USER) - self.deleteResponse('api.delete_organization_team_member', + self.deleteResponse(TeamMember, params=dict(orgname=ORGANIZATION, teamname='readers', membername=READ_ACCESS_USER)) # Verify the user was removed from the team. - json = self.getJsonResponse('api.get_organization_team_members', + json = self.getJsonResponse(TeamMemberList, params=dict(orgname=ORGANIZATION, teamname='readers')) @@ -623,7 +645,7 @@ class TestCreateRepo(ApiTestCase): def test_duplicaterepo(self): self.login(ADMIN_ACCESS_USER) - json = self.postJsonResponse('api.create_repo', + json = self.postJsonResponse(RepositoryList, data=dict(repository='simple', visibility='public'), expected_code=400) @@ -634,7 +656,7 @@ class TestCreateRepo(ApiTestCase): def test_createrepo(self): self.login(ADMIN_ACCESS_USER) - json = self.postJsonResponse('api.create_repo', + json = self.postJsonResponse(RepositoryList, data=dict(repository='newrepo', visibility='public', description='')) @@ -647,7 +669,7 @@ class TestCreateRepo(ApiTestCase): def test_createrepo_underorg(self): self.login(ADMIN_ACCESS_USER) - json = self.postJsonResponse('api.create_repo', + json = self.postJsonResponse(RepositoryList, data=dict(namespace=ORGANIZATION, repository='newrepo', visibility='private', @@ -659,7 +681,7 @@ class TestCreateRepo(ApiTestCase): class TestFindRepos(ApiTestCase): def test_findrepos_asguest(self): - json = self.getJsonResponse('api.find_repos', params=dict(query='p')) + json = self.getJsonResponse(FindRepositories, params=dict(query='p')) self.assertEquals(len(json['repositories']), 1) self.assertEquals(json['repositories'][0]['namespace'], 'public') @@ -668,7 +690,7 @@ class TestFindRepos(ApiTestCase): def test_findrepos_asuser(self): self.login(NO_ACCESS_USER) - json = self.getJsonResponse('api.find_repos', params=dict(query='p')) + json = self.getJsonResponse(FindRepositories, params=dict(query='p')) self.assertEquals(len(json['repositories']), 1) self.assertEquals(json['repositories'][0]['namespace'], 'public') @@ -677,23 +699,23 @@ class TestFindRepos(ApiTestCase): def test_findrepos_orgmember(self): self.login(READ_ACCESS_USER) - json = self.getJsonResponse('api.find_repos', params=dict(query='p')) + json = self.getJsonResponse(FindRepositories, params=dict(query='p')) self.assertGreater(len(json['repositories']), 1) class TestListRepos(ApiTestCase): def test_listrepos_asguest(self): - json = self.getJsonResponse('api.list_repos', params=dict(public=True)) + json = self.getJsonResponse(RepositoryList, params=dict(public=True)) self.assertEquals(len(json['repositories']), 1) def test_listrepos_orgmember(self): self.login(READ_ACCESS_USER) - json = self.getJsonResponse('api.list_repos', params=dict(public=True)) + json = self.getJsonResponse(RepositoryList, params=dict(public=True)) self.assertGreater(len(json['repositories']), 1) def test_listrepos_filter(self): self.login(READ_ACCESS_USER) - json = self.getJsonResponse('api.list_repos', + json = self.getJsonResponse(RepositoryList, params=dict(namespace=ORGANIZATION, public=False)) @@ -702,7 +724,7 @@ class TestListRepos(ApiTestCase): def test_listrepos_limit(self): self.login(READ_ACCESS_USER) - json = self.getJsonResponse('api.list_repos', params=dict(limit=2)) + json = self.getJsonResponse(RepositoryList, params=dict(limit=2)) self.assertEquals(len(json['repositories']), 2) @@ -712,12 +734,12 @@ class TestUpdateRepo(ApiTestCase): def test_updatedescription(self): self.login(ADMIN_ACCESS_USER) - self.putJsonResponse('api.update_repo', + self.putJsonResponse(Repository, params=dict(repository=self.SIMPLE_REPO), data=dict(description='Some cool repo')) # Verify the repo description was updated. - json = self.getJsonResponse('api.get_repo', + json = self.getJsonResponse(Repository, params=dict(repository=self.SIMPLE_REPO)) self.assertEquals('Some cool repo', json['description']) @@ -729,23 +751,23 @@ class TestChangeRepoVisibility(ApiTestCase): self.login(ADMIN_ACCESS_USER) # Make public. - self.postJsonResponse('api.change_repo_visibility', + self.postJsonResponse(RepositoryVisibility, params=dict(repository=self.SIMPLE_REPO), data=dict(visibility='public')) # Verify the visibility. - json = self.getJsonResponse('api.get_repo', + json = self.getJsonResponse(Repository, params=dict(repository=self.SIMPLE_REPO)) self.assertEquals(True, json['is_public']) # Make private. - self.postJsonResponse('api.change_repo_visibility', + self.postJsonResponse(RepositoryVisibility, params=dict(repository=self.SIMPLE_REPO), data=dict(visibility='private')) # Verify the visibility. - json = self.getJsonResponse('api.get_repo', + json = self.getJsonResponse(Repository, params=dict(repository=self.SIMPLE_REPO)) self.assertEquals(False, json['is_public']) @@ -756,11 +778,11 @@ class TestDeleteRepository(ApiTestCase): def test_deleterepo(self): self.login(ADMIN_ACCESS_USER) - self.deleteResponse('api.delete_repository', + self.deleteResponse(Repository, params=dict(repository=self.SIMPLE_REPO)) # Verify the repo was deleted. - self.getResponse('api.get_repo', + self.getResponse(Repository, params=dict(repository=self.SIMPLE_REPO), expected_code=404) @@ -768,7 +790,7 @@ class TestDeleteRepository(ApiTestCase): class TestGetRepository(ApiTestCase): PUBLIC_REPO = PUBLIC_USER + '/publicrepo' def test_getrepo_public_asguest(self): - json = self.getJsonResponse('api.get_repo', + json = self.getJsonResponse(Repository, params=dict(repository=self.PUBLIC_REPO)) self.assertEquals(PUBLIC_USER, json['namespace']) @@ -786,7 +808,7 @@ class TestGetRepository(ApiTestCase): def test_getrepo_public_asowner(self): self.login(PUBLIC_USER) - json = self.getJsonResponse('api.get_repo', + json = self.getJsonResponse(Repository, params=dict(repository=self.PUBLIC_REPO)) self.assertEquals(False, json['is_organization']) @@ -796,7 +818,7 @@ class TestGetRepository(ApiTestCase): def test_getrepo_building(self): self.login(ADMIN_ACCESS_USER) - json = self.getJsonResponse('api.get_repo', + json = self.getJsonResponse(Repository, params=dict(repository=ADMIN_ACCESS_USER + '/building')) self.assertEquals(True, json['can_write']) @@ -805,14 +827,14 @@ class TestGetRepository(ApiTestCase): self.assertEquals(False, json['is_organization']) def test_getrepo_org_asnonmember(self): - self.getResponse('api.get_repo', + self.getResponse(Repository, params=dict(repository=ORGANIZATION + '/' + ORG_REPO), expected_code=403) def test_getrepo_org_asreader(self): self.login(READ_ACCESS_USER) - json = self.getJsonResponse('api.get_repo', + json = self.getJsonResponse(Repository, params=dict(repository=ORGANIZATION + '/' + ORG_REPO)) self.assertEquals(ORGANIZATION, json['namespace']) @@ -826,7 +848,7 @@ class TestGetRepository(ApiTestCase): def test_getrepo_org_asadmin(self): self.login(ADMIN_ACCESS_USER) - json = self.getJsonResponse('api.get_repo', + json = self.getJsonResponse(Repository, params=dict(repository=ORGANIZATION + '/' + ORG_REPO)) self.assertEquals(True, json['can_write']) @@ -839,7 +861,7 @@ class TestRepoBuilds(ApiTestCase): def test_getrepo_nobuilds(self): self.login(ADMIN_ACCESS_USER) - json = self.getJsonResponse('api.get_repo_builds', + json = self.getJsonResponse(RepositoryBuildList, params=dict(repository=ADMIN_ACCESS_USER + '/simple')) assert len(json['builds']) == 0 @@ -847,7 +869,7 @@ class TestRepoBuilds(ApiTestCase): def test_getrepobuilds(self): self.login(ADMIN_ACCESS_USER) - json = self.getJsonResponse('api.get_repo_builds', + json = self.getJsonResponse(RepositoryBuildList, params=dict(repository=ADMIN_ACCESS_USER + '/building')) assert len(json['builds']) > 0 @@ -857,7 +879,7 @@ class TestRepoBuilds(ApiTestCase): assert 'status' in build # Check the status endpoint. - status_json = self.getJsonResponse('api.get_repo_build_status', + status_json = self.getJsonResponse(RepositoryBuildStatus, params=dict(repository=ADMIN_ACCESS_USER + '/building', build_uuid=build['id'])) self.assertEquals(status_json, build) @@ -869,7 +891,7 @@ class TestRepoBuilds(ApiTestCase): assert archive_json['url'] # Check the logs. - logs_json = self.getJsonResponse('api.get_repo_build_logs', + logs_json = self.getJsonResponse(RepositoryBuildLogs, params=dict(repository=ADMIN_ACCESS_USER + '/building', build_uuid=build['id'])) assert 'logs' in logs_json @@ -879,19 +901,19 @@ class TestRequestRepoBuild(ApiTestCase): self.login(ADMIN_ACCESS_USER) # Ensure where not yet building. - json = self.getJsonResponse('api.get_repo_builds', + json = self.getJsonResponse(RepositoryBuildList, params=dict(repository=ADMIN_ACCESS_USER + '/simple')) assert len(json['builds']) == 0 # Request a (fake) build. - self.postResponse('api.request_repo_build', + self.postResponse(RepositoryBuildList, params=dict(repository=ADMIN_ACCESS_USER + '/simple'), data=dict(file_id='foobarbaz'), expected_code=201) # Check for the build. - json = self.getJsonResponse('api.get_repo_builds', + json = self.getJsonResponse(RepositoryBuildList, params=dict(repository=ADMIN_ACCESS_USER + '/building')) assert len(json['builds']) > 0 @@ -902,7 +924,7 @@ class TestWebhooks(ApiTestCase): self.login(ADMIN_ACCESS_USER) # Add a webhook. - json = self.postJsonResponse('api.create_webhook', + json = self.postJsonResponse(WebhookList, params=dict(repository=ADMIN_ACCESS_USER + '/simple'), data=dict(url='http://example.com')) @@ -910,26 +932,26 @@ class TestWebhooks(ApiTestCase): wid = json['public_id'] # Get the webhook. - json = self.getJsonResponse('api.get_webhook', + json = self.getJsonResponse(Webhook, params=dict(repository=ADMIN_ACCESS_USER + '/simple', public_id=wid)) self.assertEquals(wid, json['public_id']) self.assertEquals('http://example.com', json['parameters']['url']) # Verify the webhook is listed. - json = self.getJsonResponse('api.list_webhooks', + json = self.getJsonResponse(WebhookList, params=dict(repository=ADMIN_ACCESS_USER + '/simple')) ids = [w['public_id'] for w in json['webhooks']] assert wid in ids # Delete the webhook. - self.deleteResponse('api.delete_webhook', + self.deleteResponse(Webhook, params=dict(repository=ADMIN_ACCESS_USER + '/simple', public_id=wid), expected_code=204) # Verify the webhook is gone. - self.getResponse('api.get_webhook', + self.getResponse(Webhook, params=dict(repository=ADMIN_ACCESS_USER + '/simple', public_id=wid), expected_code=404) @@ -938,7 +960,7 @@ class TestListAndGetImage(ApiTestCase): def test_listandgetimages(self): self.login(ADMIN_ACCESS_USER) - json = self.getJsonResponse('api.list_repository_images', + json = self.getJsonResponse(RepositoryImageList, params=dict(repository=ADMIN_ACCESS_USER + '/simple')) assert len(json['images']) > 0 @@ -952,7 +974,7 @@ class TestListAndGetImage(ApiTestCase): assert 'dbid' in image assert 'size' in image - ijson = self.getJsonResponse('api.get_image', + ijson = self.getJsonResponse(RepositoryImage, params=dict(repository=ADMIN_ACCESS_USER + '/simple', image_id=image['id'])) @@ -964,14 +986,14 @@ class TestGetImageChanges(ApiTestCase): self.login(ADMIN_ACCESS_USER) # Find an image to check. - json = self.getJsonResponse('api.list_repository_images', + json = self.getJsonResponse(RepositoryImageList, params=dict(repository=ADMIN_ACCESS_USER + '/simple')) image_id = json['images'][0]['id'] # Lookup the image's changes. # TODO: Fix me once we can get fake changes into the test data - #self.getJsonResponse('api.get_image_changes', + #self.getJsonResponse(RepositoryImageChanges, # params=dict(repository=ADMIN_ACCESS_USER + '/simple', # image_id=image_id)) @@ -981,31 +1003,31 @@ class TestListAndDeleteTag(ApiTestCase): self.login(ADMIN_ACCESS_USER) # List the images for prod. - json = self.getJsonResponse('api.list_tag_images', + json = self.getJsonResponse(RepositoryTagImages, params=dict(repository=ADMIN_ACCESS_USER + '/complex', tag='prod')) prod_images = json['images'] assert len(prod_images) > 0 # List the images for staging. - json = self.getJsonResponse('api.list_tag_images', + json = self.getJsonResponse(RepositoryTagImages, params=dict(repository=ADMIN_ACCESS_USER + '/complex', tag='staging')) staging_images = json['images'] assert len(prod_images) == len(staging_images) + 1 # Delete prod. - self.deleteResponse('api.delete_full_tag', + self.deleteResponse(RepositoryTag, params=dict(repository=ADMIN_ACCESS_USER + '/complex', tag='prod'), expected_code=204) # Make sure the tag is gone. - self.getResponse('api.list_tag_images', + self.getResponse(RepositoryTagImages, params=dict(repository=ADMIN_ACCESS_USER + '/complex', tag='prod'), expected_code=404) # Make the sure the staging images are still there. - json = self.getJsonResponse('api.list_tag_images', + json = self.getJsonResponse(RepositoryTagImages, params=dict(repository=ADMIN_ACCESS_USER + '/complex', tag='staging')) self.assertEquals(staging_images, json['images']) @@ -1015,19 +1037,19 @@ class TestListAndDeleteTag(ApiTestCase): self.login(ADMIN_ACCESS_USER) # List the images for prod. - json = self.getJsonResponse('api.list_tag_images', + json = self.getJsonResponse(RepositoryTagImages, params=dict(repository=ADMIN_ACCESS_USER + '/complex', tag='prod')) prod_images = json['images'] assert len(prod_images) > 0 # Delete staging. - self.deleteResponse('api.delete_full_tag', + self.deleteResponse(RepositoryTag, params=dict(repository=ADMIN_ACCESS_USER + '/complex', tag='staging'), expected_code=204) # Make sure the prod images are still around. - json = self.getJsonResponse('api.list_tag_images', + json = self.getJsonResponse(RepositoryTagImages, params=dict(repository=ADMIN_ACCESS_USER + '/complex', tag='prod')) self.assertEquals(prod_images, json['images']) @@ -1035,11 +1057,11 @@ class TestListAndDeleteTag(ApiTestCase): class TestRepoPermissions(ApiTestCase): def listUserPermissions(self): - return self.getJsonResponse('api.list_repo_user_permissions', + return self.getJsonResponse(RepositoryUserPermissionList, params=dict(repository=ADMIN_ACCESS_USER + '/simple'))['permissions'] def listTeamPermissions(self): - return self.getJsonResponse('api.list_repo_team_permissions', + return self.getJsonResponse(RepositoryTeamPermissionList, params=dict(repository=ORGANIZATION + '/' + ORG_REPO))['permissions'] def test_userpermissions(self): @@ -1053,7 +1075,7 @@ class TestRepoPermissions(ApiTestCase): self.assertEquals('admin', permissions[ADMIN_ACCESS_USER]['role']) # Add another user. - self.putJsonResponse('api.change_user_permissions', + self.putJsonResponse(RepositoryUserPermission, params=dict(repository=ADMIN_ACCESS_USER + '/simple', username=NO_ACCESS_USER), data=dict(role='read')) @@ -1064,12 +1086,12 @@ class TestRepoPermissions(ApiTestCase): assert NO_ACCESS_USER in permissions self.assertEquals('read', permissions[NO_ACCESS_USER]['role']) - json = self.getJsonResponse('api.get_user_permissions', + json = self.getJsonResponse(RepositoryUserPermission, params=dict(repository=ADMIN_ACCESS_USER + '/simple', username=NO_ACCESS_USER)) self.assertEquals('read', json['role']) # Change the user's permissions. - self.putJsonResponse('api.change_user_permissions', + self.putJsonResponse(RepositoryUserPermission, params=dict(repository=ADMIN_ACCESS_USER + '/simple', username=NO_ACCESS_USER), data=dict(role='admin')) @@ -1081,7 +1103,7 @@ class TestRepoPermissions(ApiTestCase): self.assertEquals('admin', permissions[NO_ACCESS_USER]['role']) # Delete the user's permission. - self.deleteResponse('api.delete_user_permissions', + self.deleteResponse(RepositoryUserPermission, params=dict(repository=ADMIN_ACCESS_USER + '/simple', username=NO_ACCESS_USER)) # Verify. @@ -1102,7 +1124,7 @@ class TestRepoPermissions(ApiTestCase): self.assertEquals('read', permissions['readers']['role']) # Add another team. - self.putJsonResponse('api.change_team_permissions', + self.putJsonResponse(RepositoryTeamPermission, params=dict(repository=ORGANIZATION + '/' + ORG_REPO, teamname='owners'), data=dict(role='write')) @@ -1113,12 +1135,12 @@ class TestRepoPermissions(ApiTestCase): assert 'owners' in permissions self.assertEquals('write', permissions['owners']['role']) - json = self.getJsonResponse('api.get_team_permissions', + json = self.getJsonResponse(RepositoryTeamPermission, params=dict(repository=ORGANIZATION + '/' + ORG_REPO, teamname='owners')) self.assertEquals('write', json['role']) # Change the team's permissions. - self.putJsonResponse('api.change_team_permissions', + self.putJsonResponse(RepositoryTeamPermission, params=dict(repository=ORGANIZATION + '/' + ORG_REPO, teamname='owners'), data=dict(role='admin')) @@ -1130,7 +1152,7 @@ class TestRepoPermissions(ApiTestCase): self.assertEquals('admin', permissions['owners']['role']) # Delete the team's permission. - self.deleteResponse('api.delete_team_permissions', + self.deleteResponse(RepositoryTeamPermission, params=dict(repository=ORGANIZATION + '/' + ORG_REPO, teamname='owners')) # Verify. @@ -1142,14 +1164,14 @@ class TestRepoPermissions(ApiTestCase): class TestApiTokens(ApiTestCase): def listTokens(self): - return self.getJsonResponse('api.list_repo_tokens', + return self.getJsonResponse(RepositoryTokenList, params=dict(repository=ADMIN_ACCESS_USER + '/simple'))['tokens'] def test_tokens(self): self.login(ADMIN_ACCESS_USER) # Create a new token. - json = self.postJsonResponse('api.create_token', + json = self.postJsonResponse(RepositoryTokenList, params=dict(repository=ADMIN_ACCESS_USER + '/simple'), data=dict(role='read', friendlyName='mytoken'), expected_code=201) @@ -1163,26 +1185,26 @@ class TestApiTokens(ApiTestCase): assert token_code in tokens self.assertEquals('mytoken', tokens[token_code]['friendlyName']) - json = self.getJsonResponse('api.get_tokens', + json = self.getJsonResponse(RepositoryToken, params=dict(repository=ADMIN_ACCESS_USER + '/simple', code=token_code)) self.assertEquals(tokens[token_code], json) # Change the token's permission. - self.putJsonResponse('api.change_token', + self.putJsonResponse(RepositoryToken, params=dict(repository=ADMIN_ACCESS_USER + '/simple', code=token_code), data=dict(role='write')) # Verify. - json = self.getJsonResponse('api.get_tokens', + json = self.getJsonResponse(RepositoryToken, params=dict(repository=ADMIN_ACCESS_USER + '/simple', code=token_code)) self.assertEquals('write', json['role']) # Delete the token. - self.deleteResponse('api.delete_token', + self.deleteResponse(RepositoryToken, params=dict(repository=ADMIN_ACCESS_USER + '/simple', code=token_code)) # Verify. - self.getResponse('api.get_tokens', + self.getResponse(RepositoryToken, params=dict(repository=ADMIN_ACCESS_USER + '/simple', code=token_code), expected_code=404) @@ -1190,14 +1212,14 @@ class TestApiTokens(ApiTestCase): class TestUserCard(ApiTestCase): def test_getusercard(self): self.login(ADMIN_ACCESS_USER) - json = self.getJsonResponse('api.get_user_card') + json = self.getJsonResponse(UserCard) self.assertEquals('4242', json['card']['last4']) self.assertEquals('Visa', json['card']['type']) def test_setusercard_error(self): self.login(ADMIN_ACCESS_USER) - json = self.postJsonResponse('api.set_user_card', + json = self.postJsonResponse(UserCard, data=dict(token='sometoken'), expected_code=402) assert 'carderror' in json @@ -1206,7 +1228,7 @@ class TestUserCard(ApiTestCase): class TestOrgCard(ApiTestCase): def test_getorgcard(self): self.login(ADMIN_ACCESS_USER) - json = self.getJsonResponse('api.get_org_card', + json = self.getJsonResponse(OrganizationCard, params=dict(orgname=ORGANIZATION)) self.assertEquals('4242', json['card']['last4']) @@ -1215,13 +1237,13 @@ class TestOrgCard(ApiTestCase): class TestUserSubscription(ApiTestCase): def getSubscription(self): - return self.getJsonResponse('api.get_user_subscription') + return self.getJsonResponse(UserPlan) def test_updateplan(self): self.login(ADMIN_ACCESS_USER) # Change the plan. - self.putJsonResponse('api.update_user_subscription', + self.putJsonResponse(UserPlan, data=dict(plan='free')) # Verify @@ -1229,7 +1251,7 @@ class TestUserSubscription(ApiTestCase): self.assertEquals('free', sub['plan']) # Change the plan. - self.putJsonResponse('api.update_user_subscription', + self.putJsonResponse(UserPlan, data=dict(plan='bus-large')) # Verify @@ -1239,13 +1261,13 @@ class TestUserSubscription(ApiTestCase): class TestOrgSubscription(ApiTestCase): def getSubscription(self): - return self.getJsonResponse('api.get_org_subscription', params=dict(orgname=ORGANIZATION)) + return self.getJsonResponse(OrganizationPlan, params=dict(orgname=ORGANIZATION)) def test_updateplan(self): self.login(ADMIN_ACCESS_USER) # Change the plan. - self.putJsonResponse('api.update_org_subscription', + self.putJsonResponse(OrganizationPlan, params=dict(orgname=ORGANIZATION), data=dict(plan='free')) @@ -1254,7 +1276,7 @@ class TestOrgSubscription(ApiTestCase): self.assertEquals('free', sub['plan']) # Change the plan. - self.putJsonResponse('api.update_org_subscription', + self.putJsonResponse(OrganizationPlan, params=dict(orgname=ORGANIZATION), data=dict(plan='bus-large')) @@ -1265,13 +1287,13 @@ class TestOrgSubscription(ApiTestCase): class TestUserRobots(ApiTestCase): def getRobotNames(self): - return [r['name'] for r in self.getJsonResponse('api.get_user_robots')['robots']] + return [r['name'] for r in self.getJsonResponse(UserRobotList)['robots']] def test_robots(self): self.login(NO_ACCESS_USER) # Create a robot. - json = self.putJsonResponse('api.create_user_robot', + json = self.putJsonResponse(UserRobot, params=dict(robot_shortname='bender'), expected_code=201) @@ -1282,7 +1304,7 @@ class TestUserRobots(ApiTestCase): assert NO_ACCESS_USER + '+bender' in robots # Delete the robot. - self.deleteResponse('api.delete_user_robot', + self.deleteResponse(UserRobot, params=dict(robot_shortname='bender')) # Verify. @@ -1292,14 +1314,14 @@ class TestUserRobots(ApiTestCase): class TestOrgRobots(ApiTestCase): def getRobotNames(self): - return [r['name'] for r in self.getJsonResponse('api.get_org_robots', + return [r['name'] for r in self.getJsonResponse(OrgRobotList, params=dict(orgname=ORGANIZATION))['robots']] def test_robots(self): self.login(ADMIN_ACCESS_USER) # Create a robot. - json = self.putJsonResponse('api.create_org_robot', + json = self.putJsonResponse(OrgRobot, params=dict(orgname=ORGANIZATION, robot_shortname='bender'), expected_code=201) @@ -1310,7 +1332,7 @@ class TestOrgRobots(ApiTestCase): assert ORGANIZATION + '+bender' in robots # Delete the robot. - self.deleteResponse('api.delete_org_robot', + self.deleteResponse(OrgRobot, params=dict(orgname=ORGANIZATION, robot_shortname='bender')) # Verify. @@ -1322,7 +1344,7 @@ class TestLogs(ApiTestCase): def test_user_logs(self): self.login(ADMIN_ACCESS_USER) - json = self.getJsonResponse('api.list_user_logs') + json = self.getJsonResponse(UserLogs) assert 'logs' in json assert 'start_time' in json assert 'end_time' in json @@ -1330,7 +1352,7 @@ class TestLogs(ApiTestCase): def test_org_logs(self): self.login(ADMIN_ACCESS_USER) - json = self.getJsonResponse('api.list_org_logs', params=dict(orgname=ORGANIZATION)) + json = self.getJsonResponse(OrgLogs, params=dict(orgname=ORGANIZATION)) assert 'logs' in json assert 'start_time' in json assert 'end_time' in json @@ -1338,10 +1360,10 @@ class TestLogs(ApiTestCase): def test_performer(self): self.login(ADMIN_ACCESS_USER) - json = self.getJsonResponse('api.list_org_logs', params=dict(orgname=ORGANIZATION)) + json = self.getJsonResponse(OrgLogs, params=dict(orgname=ORGANIZATION)) all_logs = json['logs'] - json = self.getJsonResponse('api.list_org_logs', + json = self.getJsonResponse(OrgLogs, params=dict(performer=READ_ACCESS_USER, orgname=ORGANIZATION)) assert len(json['logs']) < len(all_logs) @@ -1383,11 +1405,11 @@ class TestBuildTriggers(ApiTestCase): self.login(ADMIN_ACCESS_USER) # Check a repo with no known triggers. - json = self.getJsonResponse('api.list_build_triggers', params=dict(repository=ADMIN_ACCESS_USER + '/simple')) + json = self.getJsonResponse(BuildTriggerList, params=dict(repository=ADMIN_ACCESS_USER + '/simple')) self.assertEquals(0, len(json['triggers'])) # Check a repo with one known trigger. - json = self.getJsonResponse('api.list_build_triggers', params=dict(repository=ADMIN_ACCESS_USER + '/building')) + json = self.getJsonResponse(BuildTriggerList, params=dict(repository=ADMIN_ACCESS_USER + '/building')) self.assertEquals(1, len(json['triggers'])) trigger = json['triggers'][0] @@ -1398,13 +1420,13 @@ class TestBuildTriggers(ApiTestCase): assert 'service' in trigger # Verify the get trigger method. - trigger_json = self.getJsonResponse('api.get_build_trigger', params=dict(repository=ADMIN_ACCESS_USER + '/building', + trigger_json = self.getJsonResponse(BuildTrigger, params=dict(repository=ADMIN_ACCESS_USER + '/building', trigger_uuid=trigger['id'])) self.assertEquals(trigger, trigger_json) # Check the recent builds for the trigger. - builds_json = self.getJsonResponse('api.list_trigger_recent_builds', params=dict(repository=ADMIN_ACCESS_USER + '/building', + builds_json = self.getJsonResponse(TriggerBuildList, params=dict(repository=ADMIN_ACCESS_USER + '/building', trigger_uuid=trigger['id'])) assert 'builds' in builds_json @@ -1412,16 +1434,16 @@ class TestBuildTriggers(ApiTestCase): def test_delete_build_trigger(self): self.login(ADMIN_ACCESS_USER) - json = self.getJsonResponse('api.list_build_triggers', params=dict(repository=ADMIN_ACCESS_USER + '/building')) + json = self.getJsonResponse(BuildTriggerList, params=dict(repository=ADMIN_ACCESS_USER + '/building')) self.assertEquals(1, len(json['triggers'])) trigger = json['triggers'][0] # Delete the trigger. - self.deleteResponse('api.delete_build_trigger', params=dict(repository=ADMIN_ACCESS_USER + '/building', + self.deleteResponse(BuildTrigger, params=dict(repository=ADMIN_ACCESS_USER + '/building', trigger_uuid=trigger['id'])) # Verify it was deleted. - json = self.getJsonResponse('api.list_build_triggers', params=dict(repository=ADMIN_ACCESS_USER + '/building')) + json = self.getJsonResponse(BuildTriggerList, params=dict(repository=ADMIN_ACCESS_USER + '/building')) self.assertEquals(0, len(json['triggers'])) @@ -1436,19 +1458,19 @@ class TestBuildTriggers(ApiTestCase): trigger = model.create_build_trigger(repo, 'fakeservice', 'sometoken', user) # Verify the trigger. - json = self.getJsonResponse('api.list_build_triggers', params=dict(repository=ADMIN_ACCESS_USER + '/simple')) + json = self.getJsonResponse(BuildTriggerList, params=dict(repository=ADMIN_ACCESS_USER + '/simple')) self.assertEquals(1, len(json['triggers'])) self.assertEquals(trigger.uuid, json['triggers'][0]['id']) self.assertEquals(trigger.service.name, json['triggers'][0]['service']) self.assertEquals(False, json['triggers'][0]['is_active']) # List the trigger's sources. - source_json = self.getJsonResponse('api.list_trigger_build_sources', params=dict(repository=ADMIN_ACCESS_USER + '/simple', + source_json = self.getJsonResponse(BuildTriggerSources, params=dict(repository=ADMIN_ACCESS_USER + '/simple', trigger_uuid=trigger.uuid)) self.assertEquals([{'first': 'source'}, {'second': 'sometoken'}], source_json['sources']) # List the trigger's subdirs. - subdir_json = self.postJsonResponse('api.list_build_trigger_subdirs', + subdir_json = self.postJsonResponse(BuildTriggerSubdirs, params=dict(repository=ADMIN_ACCESS_USER + '/simple', trigger_uuid=trigger.uuid), data={'somevalue': 'meh'}) @@ -1456,7 +1478,7 @@ class TestBuildTriggers(ApiTestCase): # Activate the trigger. trigger_config = {} - activate_json = self.postJsonResponse('api.activate_build_trigger', + activate_json = self.postJsonResponse(BuildTriggerActivate, params=dict(repository=ADMIN_ACCESS_USER + '/simple', trigger_uuid=trigger.uuid), data=trigger_config) @@ -1468,13 +1490,13 @@ class TestBuildTriggers(ApiTestCase): self.assertEquals(True, py_json.loads(trigger.config)['active']) # Make sure we cannot activate again. - self.postResponse('api.activate_build_trigger', + self.postResponse(BuildTriggerActivate, params=dict(repository=ADMIN_ACCESS_USER + '/simple', trigger_uuid=trigger.uuid), data=trigger_config, expected_code=400) # Start a manual build. - start_json = self.postJsonResponse('api.manually_start_build_trigger', + start_json = self.postJsonResponse(ActivateBuildTrigger, params=dict(repository=ADMIN_ACCESS_USER + '/simple', trigger_uuid=trigger.uuid), expected_code=201)