Merge remote-tracking branch 'origin/master' into rustedbuilds

Conflicts:
	test/data/test.db
This commit is contained in:
jakedt 2014-02-18 16:13:34 -05:00
commit ed38bcdafc
17 changed files with 1116 additions and 694 deletions

Binary file not shown.

View file

@ -250,7 +250,7 @@ class TestGetMatchingEntities(ApiTestCase):
json = self.getJsonResponse('api.get_matching_entities',
params=dict(prefix='o', namespace=ORGANIZATION,
includeTeams=True))
includeTeams='true'))
names = set([r['name'] for r in json['results']])
assert 'outsideorg' in names
@ -261,7 +261,7 @@ class TestGetMatchingEntities(ApiTestCase):
json = self.getJsonResponse('api.get_matching_entities',
params=dict(prefix='o', namespace=ORGANIZATION,
includeTeams=True))
includeTeams='true'))
names = set([r['name'] for r in json['results']])
assert 'outsideorg' in names
@ -684,12 +684,12 @@ class TestFindRepos(ApiTestCase):
class TestListRepos(ApiTestCase):
def test_listrepos_asguest(self):
json = self.getJsonResponse('api.list_repos', params=dict(public=True))
assert len(json['repositories']) == 0
json = self.getJsonResponse('api.list_repos', params=dict(public='true'))
assert 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('api.list_repos', params=dict(public='true'))
assert len(json['repositories']) > 1
def test_listrepos_filter(self):