diff --git a/pagure/forms.py b/pagure/forms.py index 21f5bf8..3663446 100644 --- a/pagure/forms.py +++ b/pagure/forms.py @@ -139,6 +139,7 @@ class ProjectForm(ProjectFormSimplified): create_readme = wtforms.BooleanField( 'Create README', [wtforms.validators.optional()], + false_values=('false', '', False, 'False', 0, '0'), ) namespace = wtforms.SelectField( 'Project Namespace', @@ -173,6 +174,7 @@ class IssueFormSimplied(PagureForm): private = wtforms.BooleanField( 'Private', [wtforms.validators.optional()], + false_values=('false', '', False, 'False', 0, '0'), ) @@ -326,6 +328,7 @@ class UpdateIssueForm(PagureForm): private = wtforms.BooleanField( 'Private', [wtforms.validators.optional()], + false_values=('false', '', False, 'False', 0, '0'), ) close_status = wtforms.SelectField( 'Closed as', @@ -621,5 +624,6 @@ class SubscribtionForm(PagureForm): status = wtforms.BooleanField( 'Subscription status', [wtforms.validators.optional()], + false_values=('false', '', False, 'False', 0, '0'), ) diff --git a/tests/test_pagure_flask_api_issue.py b/tests/test_pagure_flask_api_issue.py index e855680..5c01348 100644 --- a/tests/test_pagure_flask_api_issue.py +++ b/tests/test_pagure_flask_api_issue.py @@ -143,6 +143,250 @@ class PagureFlaskApiIssuetests(tests.Modeltests): } ) + # Valid request, with private='false' + data = { + 'title': 'test issue', + 'issue_content': 'This issue needs attention', + 'private': 'false', + } + + output = self.app.post( + '/api/0/test/new_issue', data=data, headers=headers) + self.assertEqual(output.status_code, 200) + data = json.loads(output.data) + data['issue']['date_created'] = '1479458613' + self.assertDictEqual( + data, + { + "issue": { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1479458613", + "depends": [], + "id": 2, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + "message": "Issue created" + } + ) + + # Valid request, with private=False + data = { + 'title': 'test issue', + 'issue_content': 'This issue needs attention', + 'private': False + } + + output = self.app.post( + '/api/0/test/new_issue', data=data, headers=headers) + self.assertEqual(output.status_code, 200) + data = json.loads(output.data) + data['issue']['date_created'] = '1479458613' + self.assertDictEqual( + data, + { + "issue": { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1479458613", + "depends": [], + "id": 3, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + "message": "Issue created" + } + ) + + # Valid request, with private='False' + data = { + 'title': 'test issue', + 'issue_content': 'This issue needs attention', + 'private': 'False' + } + + output = self.app.post( + '/api/0/test/new_issue', data=data, headers=headers) + self.assertEqual(output.status_code, 200) + data = json.loads(output.data) + data['issue']['date_created'] = '1479458613' + self.assertDictEqual( + data, + { + "issue": { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1479458613", + "depends": [], + "id": 4, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + "message": "Issue created" + } + ) + + # Valid request, with private=0 + data = { + 'title': 'test issue', + 'issue_content': 'This issue needs attention', + 'private': 0 + } + + output = self.app.post( + '/api/0/test/new_issue', data=data, headers=headers) + self.assertEqual(output.status_code, 200) + data = json.loads(output.data) + data['issue']['date_created'] = '1479458613' + self.assertDictEqual( + data, + { + "issue": { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1479458613", + "depends": [], + "id": 5, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + "message": "Issue created" + } + ) + + # Private issue: True + data = { + 'title': 'test issue', + 'issue_content': 'This issue needs attention', + 'private': True, + } + output = self.app.post( + '/api/0/test/new_issue', data=data, headers=headers) + self.assertEqual(output.status_code, 200) + data = json.loads(output.data) + data['issue']['date_created'] = '1479458613' + self.assertDictEqual( + data, + { + "issue": { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1479458613", + "depends": [], + "id": 6, + "milestone": None, + "priority": None, + "private": True, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + "message": "Issue created" + } + ) + + # Private issue: 1 + data = { + 'title': 'test issue', + 'issue_content': 'This issue needs attention', + 'private': 1, + } + output = self.app.post( + '/api/0/test/new_issue', data=data, headers=headers) + self.assertEqual(output.status_code, 200) + data = json.loads(output.data) + data['issue']['date_created'] = '1479458613' + self.assertDictEqual( + data, + { + "issue": { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1479458613", + "depends": [], + "id": 7, + "milestone": None, + "priority": None, + "private": True, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + "message": "Issue created" + } + ) + def test_api_view_issues(self): """ Test the api_view_issues method of the flask api. """ self.test_api_new_issue() @@ -159,11 +403,305 @@ class PagureFlaskApiIssuetests(tests.Modeltests): } ) - # List all opened issues - output = self.app.get('/api/0/test/issues') + # List all opened issues + output = self.app.get('/api/0/test/issues') + self.assertEqual(output.status_code, 200) + data = json.loads(output.data) + for idx in range(len(data['issues'])): + data['issues'][idx]['date_created'] = '1431414800' + self.assertDictEqual( + data, + { + "args": { + "assignee": None, + "author": None, + "status": None, + "tags": [] + }, + "issues": [ + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 5, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 4, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 3, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 2, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 1, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + } + ], + "total_issues": 5 + } + ) + + # Create private issue + repo = pagure.lib.get_project(self.session, 'test') + msg = pagure.lib.new_issue( + session=self.session, + repo=repo, + title='Test issue', + content='We should work on this', + user='pingou', + ticketfolder=None, + private=True, + ) + self.session.commit() + self.assertEqual(msg.title, 'Test issue') + + # Access issues un-authenticated + output = self.app.get('/api/0/test/issues') + self.assertEqual(output.status_code, 200) + data = json.loads(output.data) + for idx in range(len(data['issues'])): + data['issues'][idx]['date_created'] = '1431414800' + self.assertDictEqual( + data, + { + "args": { + "assignee": None, + "author": None, + "status": None, + "tags": [] + }, + "issues": [ + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 5, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 4, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 3, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 2, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 1, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + } + ], + "total_issues": 5 + } + ) + headers = {'Authorization': 'token aaabbbccc'} + + # Access issues authenticated but non-existing token + output = self.app.get('/api/0/test/issues', headers=headers) + self.assertEqual(output.status_code, 401) + + # Create a new token for another user + item = pagure.lib.model.Token( + id='bar_token', + user_id=2, + project_id=1, + expiration=datetime.datetime.utcnow() + datetime.timedelta( + days=30) + ) + self.session.add(item) + + headers = {'Authorization': 'token bar_token'} + + # Access issues authenticated but wrong token + output = self.app.get('/api/0/test/issues', headers=headers) self.assertEqual(output.status_code, 200) data = json.loads(output.data) - data['issues'][0]['date_created'] = '1431414800' + for idx in range(len(data['issues'])): + data['issues'][idx]['date_created'] = '1431414800' self.assertDictEqual( data, { @@ -173,17 +711,104 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "status": None, "tags": [] }, - "total_issues": 1, "issues": [ { "assignee": None, "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 5, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 4, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 3, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, "comments": [], "content": "This issue needs attention", "custom_fields": [], "date_created": "1431414800", + "depends": [], + "id": 2, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], "close_status": None, "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", "depends": [], "id": 1, "milestone": None, @@ -197,29 +822,19 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "name": "pingou" } } - ] + ], + "total_issues": 5 } ) - # Create private issue - repo = pagure.lib.get_project(self.session, 'test') - msg = pagure.lib.new_issue( - session=self.session, - repo=repo, - title='Test issue', - content='We should work on this', - user='pingou', - ticketfolder=None, - private=True, - ) - self.session.commit() - self.assertEqual(msg.title, 'Test issue') + headers = {'Authorization': 'token aaabbbcccddd'} - # Access issues un-authenticated - output = self.app.get('/api/0/test/issues') + # Access issues authenticated correctly + output = self.app.get('/api/0/test/issues', headers=headers) self.assertEqual(output.status_code, 200) data = json.loads(output.data) - data['issues'][0]['date_created'] = '1431414800' + for idx in range(len(data['issues'])): + data['issues'][idx]['date_created'] = '1431414800' self.assertDictEqual( data, { @@ -229,19 +844,106 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "status": None, "tags": [] }, - "total_issues": 1, "issues": [ { "assignee": None, "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "We should work on this", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 8, + "milestone": None, + "priority": None, + "private": True, + "status": "Open", + "tags": [], + "title": "Test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 7, + "milestone": None, + "priority": None, + "private": True, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 6, + "milestone": None, + "priority": None, + "private": True, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 5, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, "comments": [], "content": "This issue needs attention", "custom_fields": [], "date_created": "1431414800", - "close_status": None, - "closed_at": None, "depends": [], - "id": 1, + "id": 4, "milestone": None, "priority": None, "private": False, @@ -252,55 +954,18 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "fullname": "PY C", "name": "pingou" } - } - ] - } - ) - headers = {'Authorization': 'token aaabbbccc'} - - # Access issues authenticated but non-existing token - output = self.app.get('/api/0/test/issues', headers=headers) - self.assertEqual(output.status_code, 401) - - # Create a new token for another user - item = pagure.lib.model.Token( - id='bar_token', - user_id=2, - project_id=1, - expiration=datetime.datetime.utcnow() + datetime.timedelta( - days=30) - ) - self.session.add(item) - - headers = {'Authorization': 'token bar_token'} - - # Access issues authenticated but wrong token - output = self.app.get('/api/0/test/issues', headers=headers) - self.assertEqual(output.status_code, 200) - data = json.loads(output.data) - data['issues'][0]['date_created'] = '1431414800' - self.assertDictEqual( - data, - { - "args": { - "assignee": None, - "author": None, - "status": None, - "tags": [] - }, - "total_issues": 1, - "issues": [ + }, { "assignee": None, "blocks": [], + "close_status": None, + "closed_at": None, "comments": [], "content": "This issue needs attention", "custom_fields": [], "date_created": "1431414800", - "close_status": None, - "closed_at": None, "depends": [], - "id": 1, + "id": 3, "milestone": None, "priority": None, "private": False, @@ -311,47 +976,24 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "fullname": "PY C", "name": "pingou" } - } - ] - } - ) - - headers = {'Authorization': 'token aaabbbcccddd'} - - # Access issues authenticated correctly - output = self.app.get('/api/0/test/issues', headers=headers) - self.assertEqual(output.status_code, 200) - data = json.loads(output.data) - data['issues'][0]['date_created'] = '1431414800' - data['issues'][1]['date_created'] = '1431414800' - self.assertDictEqual( - data, - { - "args": { - "assignee": None, - "author": None, - "status": None, - "tags": [] - }, - "total_issues": 2, - "issues": [ + }, { "assignee": None, "blocks": [], + "close_status": None, + "closed_at": None, "comments": [], - "content": "We should work on this", + "content": "This issue needs attention", "custom_fields": [], "date_created": "1431414800", - "close_status": None, - "closed_at": None, "depends": [], "id": 2, "milestone": None, "priority": None, - "private": True, + "private": False, "status": "Open", "tags": [], - "title": "Test issue", + "title": "test issue", "user": { "fullname": "PY C", "name": "pingou" @@ -360,12 +1002,12 @@ class PagureFlaskApiIssuetests(tests.Modeltests): { "assignee": None, "blocks": [], + "close_status": None, + "closed_at": None, "comments": [], "content": "This issue needs attention", "custom_fields": [], "date_created": "1431414800", - "close_status": None, - "closed_at": None, "depends": [], "id": 1, "milestone": None, @@ -379,7 +1021,8 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "name": "pingou" } } - ] + ], + "total_issues": 8 } ) @@ -423,8 +1066,8 @@ class PagureFlaskApiIssuetests(tests.Modeltests): output = self.app.get('/api/0/test/issues?status=All', headers=headers) self.assertEqual(output.status_code, 200) data = json.loads(output.data) - data['issues'][0]['date_created'] = '1431414800' - data['issues'][1]['date_created'] = '1431414800' + for idx in range(len(data['issues'])): + data['issues'][idx]['date_created'] = '1431414800' self.assertDictEqual( data, { @@ -434,53 +1077,186 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "status": "All", "tags": [] }, - "total_issues": 2, "issues": [ - { - "assignee": None, - "blocks": [], - "comments": [], - "content": "We should work on this", - "custom_fields": [], - "date_created": "1431414800", - "close_status": None, - "closed_at": None, - "depends": [], - "id": 2, - "milestone": None, - "priority": None, - "private": True, - "status": "Open", - "tags": [], - "title": "Test issue", - "user": { - "fullname": "PY C", - "name": "pingou" - } - }, - { - "assignee": None, - "blocks": [], - "comments": [], - "content": "This issue needs attention", - "custom_fields": [], - "date_created": "1431414800", - "close_status": None, - "closed_at": None, - "depends": [], - "id": 1, - "milestone": None, - "priority": None, - "private": False, - "status": "Open", - "tags": [], - "title": "test issue", - "user": { - "fullname": "PY C", - "name": "pingou" - } - } - ], + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "We should work on this", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 8, + "milestone": None, + "priority": None, + "private": True, + "status": "Open", + "tags": [], + "title": "Test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 7, + "milestone": None, + "priority": None, + "private": True, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 6, + "milestone": None, + "priority": None, + "private": True, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 5, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 4, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 3, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 2, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + }, + { + "assignee": None, + "blocks": [], + "close_status": None, + "closed_at": None, + "comments": [], + "content": "This issue needs attention", + "custom_fields": [], + "date_created": "1431414800", + "depends": [], + "id": 1, + "milestone": None, + "priority": None, + "private": False, + "status": "Open", + "tags": [], + "title": "test issue", + "user": { + "fullname": "PY C", + "name": "pingou" + } + } + ], + "total_issues": 8 + } ) @@ -559,7 +1335,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): self.assertEqual(msg.title, 'Test issue') # Access private issue un-authenticated - output = self.app.get('/api/0/test/issue/2') + output = self.app.get('/api/0/test/issue/6') self.assertEqual(output.status_code, 403) data = json.loads(output.data) self.assertDictEqual( @@ -573,7 +1349,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): headers = {'Authorization': 'token aaabbbccc'} # Access private issue authenticated but non-existing token - output = self.app.get('/api/0/test/issue/2', headers=headers) + output = self.app.get('/api/0/test/issue/6', headers=headers) self.assertEqual(output.status_code, 401) data = json.loads(output.data) self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.name, @@ -593,7 +1369,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): headers = {'Authorization': 'token bar_token'} # Access private issue authenticated but wrong token - output = self.app.get('/api/0/test/issue/2', headers=headers) + output = self.app.get('/api/0/test/issue/6', headers=headers) self.assertEqual(output.status_code, 403) data = json.loads(output.data) self.assertDictEqual( @@ -607,7 +1383,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): headers = {'Authorization': 'token aaabbbcccddd'} # Access private issue authenticated correctly - output = self.app.get('/api/0/test/issue/2', headers=headers) + output = self.app.get('/api/0/test/issue/6', headers=headers) self.assertEqual(output.status_code, 200) data = json.loads(output.data) data['date_created'] = '1431414800' @@ -617,19 +1393,19 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "assignee": None, "blocks": [], "comments": [], - "content": "We should work on this", + "content": "This issue needs attention", "custom_fields": [], "date_created": "1431414800", "close_status": None, "closed_at": None, "depends": [], - "id": 2, + "id": 6, "milestone": None, "priority": None, "private": True, "status": "Open", "tags": [], - "title": "Test issue", + "title": "test issue", "user": { "fullname": "PY C", "name": "pingou" @@ -654,7 +1430,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "close_status": None, "closed_at": None, "depends": [], - "id": 2, + "id": 8, "milestone": None, "priority": None, "private": True,