',
'': '',
+ '$$FLAG_STATUSES_COMMAS$$':
+ ', '.join(sorted(pagure_config['FLAG_STATUSES_LABELS'].keys())),
+ '$$FLAG_SUCCESS$$': pagure_config['FLAG_SUCCESS'],
+ '$$FLAG_FAILURE$$': pagure_config['FLAG_FAILURE'],
+ '$$FLAG_PENDING$$': pagure_config['FLAG_PENDING'],
}
for old, new in substitutions.items():
html = html.replace(old, new)
diff --git a/pagure/forms.py b/pagure/forms.py
index c0a68fd..0afd626 100644
--- a/pagure/forms.py
+++ b/pagure/forms.py
@@ -488,16 +488,20 @@ class AddPullRequestFlagFormV1(PagureForm):
class AddPullRequestFlagForm(AddPullRequestFlagFormV1):
''' Form to add a flag to a pull-request or commit. '''
+ def __init__(self, *args, **kwargs):
+ # we need to instantiate dynamically because the configuration
+ # values may change during tests and we want to always respect
+ # the currently set value
+ super(AddPullRequestFlagForm, self).__init__(*args, **kwargs)
+ self.status.choices = list(zip(
+ pagure_config['FLAG_STATUSES_LABELS'].keys(),
+ pagure_config['FLAG_STATUSES_LABELS'].keys()
+ ))
+
status = wtforms.SelectField(
'status',
[wtforms.validators.Required()],
- choices=[
- ('success', 'success'),
- ('failure', 'failure'),
- ('error', 'error'),
- ('canceled', 'canceled'),
- ('pending', 'pending'),
- ],
+ choices=[],
)
diff --git a/pagure/ui/filters.py b/pagure/ui/filters.py
index 45c8378..8794b0c 100644
--- a/pagure/ui/filters.py
+++ b/pagure/ui/filters.py
@@ -663,11 +663,4 @@ def table_get_link_order(column, order_key, order):
def flag_to_label(flag):
""" For a given flag return the bootstrap label to use
"""
- status = {
- 'success': 'label-success',
- 'failure': 'label-danger',
- 'error': 'label-danger',
- 'pending': 'label-info',
- 'canceled': 'label-warning',
- }
- return status[flag.status.lower()]
+ return pagure_config['FLAG_STATUSES_LABELS'][flag.status.lower()]
diff --git a/tests/test_pagure_flask_api_pr_flag.py b/tests/test_pagure_flask_api_pr_flag.py
index d711e8e..9f1b47e 100644
--- a/tests/test_pagure_flask_api_pr_flag.py
+++ b/tests/test_pagure_flask_api_pr_flag.py
@@ -19,6 +19,7 @@ sys.path.insert(0, os.path.join(os.path.dirname(
os.path.abspath(__file__)), '..'))
import pagure # noqa
+import pagure.config # noqa
import pagure.lib # noqa
import tests # noqa
@@ -425,6 +426,76 @@ class PagureFlaskApiPRFlagtests(tests.Modeltests):
self.assertEqual(request.flags[1].comment, 'Tests running again')
self.assertEqual(request.flags[1].percent, None)
+ @patch.dict('pagure.config.config',
+ {
+ 'FLAG_STATUSES_LABELS':
+ {
+ 'pend!': 'label-info',
+ 'succeed!': 'label-success',
+ 'fail!': 'label-danger',
+ 'what?': 'label-warning',
+ },
+ 'FLAG_PENDING': 'pend!',
+ 'FLAG_SUCCESS': 'succeed!',
+ 'FLAG_FAILURE': 'fail!',
+ })
+ def test_flagging_a_pull_request_while_having_custom_statuses(self):
+ """ Test flagging a PR while having custom statuses. """
+ headers = {'Authorization': 'token aaabbbcccddd'}
+
+ # No status and no percent => should use FLAG_PENDING
+ send_data = {
+ 'username': 'Jenkins',
+ 'comment': 'Tests running',
+ 'url': 'http://jenkins.cloud.fedoraproject.org/',
+ 'uid': 'jenkins_build_pagure_100+seed',
+ }
+
+ output = self.app.post(
+ '/api/0/test/pull-request/1/flag', data=send_data, headers=headers)
+ data = json.loads(output.data)
+ self.assertEqual(output.status_code, 200)
+ self.assertEqual(data['flag']['status'], 'pend!')
+
+ # No status and 50 % => should use FLAG_SUCCESS
+ send_data['percent'] = 50
+ output = self.app.post(
+ '/api/0/test/pull-request/1/flag', data=send_data, headers=headers)
+ data = json.loads(output.data)
+ self.assertEqual(output.status_code, 200)
+ self.assertEqual(data['flag']['status'], 'succeed!')
+
+ # No status and 0 % => should use FLAG_FAILURE
+ send_data['percent'] = 0
+ output = self.app.post(
+ '/api/0/test/pull-request/1/flag', data=send_data, headers=headers)
+ data = json.loads(output.data)
+ self.assertEqual(output.status_code, 200)
+ self.assertEqual(data['flag']['status'], 'fail!')
+
+ # Explicitly set status
+ send_data['status'] = 'what?'
+ output = self.app.post(
+ '/api/0/test/pull-request/1/flag', data=send_data, headers=headers)
+ data = json.loads(output.data)
+ self.assertEqual(output.status_code, 200)
+ self.assertEqual(data['flag']['status'], 'what?')
+
+ # Explicitly set wrong status
+ send_data['status'] = 'nooo.....'
+ output = self.app.post(
+ '/api/0/test/pull-request/1/flag', data=send_data, headers=headers)
+ data = json.loads(output.data)
+ self.assertEqual(output.status_code, 400)
+ self.assertDictEqual(
+ data,
+ {
+ "error": "Invalid or incomplete input submitted",
+ "error_code": "EINVALIDREQ",
+ "errors": {"status": ["Not a valid choice"]}
+ }
+ )
+
class PagureFlaskApiPRFlagUserTokentests(tests.Modeltests):
""" Tests for the flask API of pagure for flagging pull-requests using
diff --git a/tests/test_pagure_flask_api_project.py b/tests/test_pagure_flask_api_project.py
index 742425d..665bef8 100644
--- a/tests/test_pagure_flask_api_project.py
+++ b/tests/test_pagure_flask_api_project.py
@@ -3108,6 +3108,56 @@ class PagureFlaskApiProjectFlagtests(tests.Modeltests):
user_from=u'Jenkins'
)
+ @patch.dict('pagure.config.config',
+ {
+ 'FLAG_STATUSES_LABELS':
+ {
+ 'pend!': 'label-info',
+ 'succeed!': 'label-success',
+ 'fail!': 'label-danger',
+ 'what?': 'label-warning',
+ },
+ 'FLAG_PENDING': 'pend!',
+ 'FLAG_SUCCESS': 'succeed!',
+ 'FLAG_FAILURE': 'fail!',
+ })
+ def test_flag_commit_with_custom_flags(self):
+ """ Test flagging when custom flags are set up
+ """
+ repo_obj = pygit2.Repository(self.git_path)
+ commit = repo_obj.revparse_single('HEAD')
+
+ headers = {'Authorization': 'token aaabbbcccddd'}
+ send_data = {
+ 'username': 'Jenkins',
+ 'percent': 100,
+ 'comment': 'Tests passed',
+ 'url': 'http://jenkins.cloud.fedoraproject.org/',
+ 'status': 'succeed!',
+ }
+ output = self.app.post(
+ '/api/0/test/c/%s/flag' % commit.oid.hex,
+ headers=headers, data=send_data)
+ self.assertEqual(output.status_code, 200)
+ data = json.loads(output.data)
+ self.assertEqual(data['flag']['status'], 'succeed!')
+
+ # Try invalid flag status
+ send_data['status'] = 'nooooo....'
+ output = self.app.post(
+ '/api/0/test/c/%s/flag' % commit.oid.hex,
+ headers=headers, data=send_data)
+ self.assertEqual(output.status_code, 400)
+ data = json.loads(output.data)
+ self.assertEqual(
+ data,
+ {
+ u'errors': {u'status': [u'Not a valid choice']},
+ u'error_code': u'EINVALIDREQ',
+ u'error': u'Invalid or incomplete input submitted'
+ }
+ )
+
if __name__ == '__main__':
unittest.main(verbosity=2)
diff --git a/tests/test_pagure_flask_ui_repo_flag_commit.py b/tests/test_pagure_flask_ui_repo_flag_commit.py
index 6b6c267..482f3b2 100644
--- a/tests/test_pagure_flask_ui_repo_flag_commit.py
+++ b/tests/test_pagure_flask_ui_repo_flag_commit.py
@@ -12,6 +12,7 @@ import unittest
import sys
import os
+from mock import patch
import pygit2
sys.path.insert(0, os.path.join(os.path.dirname(
@@ -263,6 +264,55 @@ class ViewCommitFlagtests(tests.SimplePagureTest):
self.assertIn(
'Build canceled', output.data)
+ @patch.dict('pagure.config.config',
+ {
+ 'FLAG_STATUSES_LABELS':
+ {
+ 'status1': 'label-warning',
+ 'otherstatus': 'label-success',
+ },
+ })
+ def test_view_commit_with_custom_flags(self):
+ """ Test the view_commit endpoint while having custom flags. """
+ repo = pagure.lib.get_authorized_project(self.session, 'test')
+
+ msg = pagure.lib.add_commit_flag(
+ session=self.session,
+ repo=repo,
+ commit_hash=self.commit.oid.hex,
+ username='simple-koji-ci',
+ status='status1',
+ percent=None,
+ comment='Build canceled',
+ url='https://koji.fp.o/koji...',
+ uid='uid',
+ user='foo',
+ token='aaabbbcccddd'
+ )
+ self.session.commit()
+ self.assertEqual(msg, ('Flag added', 'uid'))
+
+ # View first commit
+ output = self.app.get('/test/c/%s' % self.commit.oid.hex)
+ self.assertEqual(output.status_code, 200)
+ self.assertIn(
+ '