Merge pull request #349 from coreos-inc/buildreffix

Really fix the build trigger schema and add a test for it
This commit is contained in:
Jimmy Zelinskie 2015-08-11 17:27:51 -04:00
commit aee746bec6
2 changed files with 4 additions and 8 deletions

View file

@ -402,12 +402,8 @@ class ActivateBuildTrigger(RepositoryParamResource):
'description': '(Custom Only) If specified, the ref/SHA1 used to checkout a git repository.'
},
'refs': {
'type': 'array',
'description': '(SCM Only) If specified, the refs to build.'
},
'branch_name': {
'type': 'string',
'description': '(SCM Only) If specified, the branch to build.'
'type': 'object',
'description': '(SCM Only) If specified, the ref to build.'
}
},
'additionalProperties': False

View file

@ -2993,7 +2993,7 @@ class TestBuildTriggers(ApiTestCase):
start_json = self.postJsonResponse(ActivateBuildTrigger,
params=dict(repository=ADMIN_ACCESS_USER + '/simple',
trigger_uuid=trigger.uuid),
data=dict(refs=[{'kind': 'branch', 'name': 'foobar'}]),
data=dict(refs={'kind': 'branch', 'name': 'foobar'}),
expected_code=201)
def test_invalid_robot_account(self):
@ -3058,7 +3058,7 @@ class TestBuildTriggers(ApiTestCase):
start_json = self.postJsonResponse(ActivateBuildTrigger,
params=dict(repository=ADMIN_ACCESS_USER + '/simple',
trigger_uuid=trigger.uuid),
data=dict(),
data=dict(refs=dict(kind='branch', name='foobar')),
expected_code=201)
assert 'id' in start_json