diff --git a/tests/__init__.py b/tests/__init__.py index f563252..940742c 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -200,6 +200,7 @@ def create_projects(session): user_id=1, # pingou name='test', description='test project #1', + hook_token='aaabbbccc', ) session.add(item) @@ -207,6 +208,7 @@ def create_projects(session): user_id=1, # pingou name='test2', description='test project #2', + hook_token='aaabbbddd', ) session.add(item) diff --git a/tests/test_progit_flask_ui_app.py b/tests/test_progit_flask_ui_app.py index 1be823f..7f14ca0 100644 --- a/tests/test_progit_flask_ui_app.py +++ b/tests/test_progit_flask_ui_app.py @@ -68,6 +68,7 @@ class PagureFlaskApptests(tests.Modeltests): user_id=2, # foo name='test3', description='test project #3 with a very long description', + hook_token='aaabbbeee', ) self.session.add(item) self.session.commit() diff --git a/tests/test_progit_flask_ui_repo.py b/tests/test_progit_flask_ui_repo.py index 59d117e..32c8524 100644 --- a/tests/test_progit_flask_ui_repo.py +++ b/tests/test_progit_flask_ui_repo.py @@ -235,10 +235,10 @@ class PagureFlaskRepotests(tests.Modeltests): # Both checkbox checked before self.assertTrue( '' in output.data) + 'name="project_documentation" checked=""/>' in output.data) self.assertTrue( '' in output.data) + 'name="issue_tracker" checked=""/>' in output.data) csrf_token = output.data.split( 'name="csrf_token" type="hidden" value="')[1].split('">')[0] @@ -261,10 +261,10 @@ class PagureFlaskRepotests(tests.Modeltests): '' in output.data) self.assertTrue( '' in output.data) + 'name="project_documentation" checked=""/>' in output.data) self.assertTrue( '' in output.data) + 'name="issue_tracker" checked=""/>' in output.data) data = {'csrf_token': csrf_token} output = self.app.post( @@ -287,10 +287,10 @@ class PagureFlaskRepotests(tests.Modeltests): '' in output.data) self.assertTrue( '' in output.data) + 'name="project_documentation" />' in output.data) self.assertTrue( '' in output.data) + 'name="issue_tracker" />' in output.data) def test_view_forks(self): """ Test the view_forks endpoint. """ @@ -366,6 +366,7 @@ class PagureFlaskRepotests(tests.Modeltests): name='test3', description='test project #3', parent_id=1, + hook_token='aaabbbmmm', ) self.session.add(item) self.session.commit() @@ -446,6 +447,7 @@ class PagureFlaskRepotests(tests.Modeltests): name='test3', description='test project #3', parent_id=1, + hook_token='aaabbbnnn', ) self.session.add(item) self.session.commit() @@ -527,6 +529,7 @@ class PagureFlaskRepotests(tests.Modeltests): name='test3', description='test project #3', parent_id=1, + hook_token='aaabbbooo', ) self.session.add(item) self.session.commit() @@ -641,6 +644,7 @@ class PagureFlaskRepotests(tests.Modeltests): name='test3', description='test project #3', parent_id=1, + hook_token='aaabbbppp', ) self.session.add(item) self.session.commit() @@ -742,6 +746,7 @@ class PagureFlaskRepotests(tests.Modeltests): name='test3', description='test project #3', parent_id=1, + hook_token='aaabbbqqq', ) self.session.add(item) self.session.commit() @@ -815,6 +820,7 @@ class PagureFlaskRepotests(tests.Modeltests): name='test3', description='test project #3', parent_id=1, + hook_token='aaabbbkkk', ) self.session.add(item) self.session.commit() @@ -921,6 +927,7 @@ index 0000000..11980b1 name='test3', description='test project #3', parent_id=1, + hook_token='aaabbblll', ) self.session.add(item) self.session.commit() @@ -1013,6 +1020,7 @@ index 0000000..fb7093d name='test3', description='test project #3', parent_id=1, + hook_token='aaabbbfff', ) self.session.add(item) self.session.commit() @@ -1066,6 +1074,7 @@ index 0000000..fb7093d user_id=1, # pingou name='test', description='test project #1', + hook_token='aaabbbggg', ) self.session.add(item) self.session.commit() @@ -1083,6 +1092,7 @@ index 0000000..fb7093d user_id=1, # pingou name='test', description='test project #1', + hook_token='aaabbbhhh', ) self.session.add(item) self.session.commit() @@ -1099,6 +1109,7 @@ index 0000000..fb7093d user_id=1, # pingou name='test', description='test project #1', + hook_token='aaabbbiii', ) self.session.add(item) self.session.commit() @@ -1116,6 +1127,7 @@ index 0000000..fb7093d name='test3', description='test project #3', parent_id=1, + hook_token='aaabbbjjj', ) self.session.add(item) self.session.commit() diff --git a/tests/test_progit_lib.py b/tests/test_progit_lib.py index 55336d1..4bd1d4e 100644 --- a/tests/test_progit_lib.py +++ b/tests/test_progit_lib.py @@ -601,7 +601,6 @@ class PagureLibtests(tests.Modeltests): p_send_email.return_value = True p_ugt.return_value = True - tests.create_projects(self.session) self.test_new_issue() repo = pagure.lib.get_project(self.session, 'test') @@ -818,7 +817,9 @@ class PagureLibtests(tests.Modeltests): 'issue_tracker': True, 'project_documentation': True, 'pull_requests': True, - 'Only_assignee_can_close_pull': False, + 'Only_assignee_can_merge_pull-request': False, + 'Minimum_score_to_merge_pull-request': -1, + 'Web-hooks': None, }, user='pingou', ) @@ -830,6 +831,10 @@ class PagureLibtests(tests.Modeltests): settings={ 'issue_tracker': False, 'project_documentation': False, + 'pull_requests': False, + 'Only_assignee_can_merge_pull-request': False, + 'Minimum_score_to_merge_pull-request': -1, + 'Web-hooks': None, }, user='pingou', ) @@ -879,6 +884,7 @@ class PagureLibtests(tests.Modeltests): name='test', description='test project #1', parent_id=1, + hook_token='aaabbbttt', ) self.session.add(item) @@ -887,6 +893,7 @@ class PagureLibtests(tests.Modeltests): name='test2', description='test project #2', parent_id=2, + hook_token='aaabbbuuu', ) self.session.add(item) @@ -1033,7 +1040,7 @@ class PagureLibtests(tests.Modeltests): ticketfolder=ticketfolder, requestfolder=requestfolder, description='description for testproject', - parent_id=None + parent_id=None, ) self.session.commit() self.assertEqual(msg, 'Project "testproject" created') @@ -1198,6 +1205,7 @@ class PagureLibtests(tests.Modeltests): name='test', description='test project #1', parent_id=1, + hook_token='aaabbbrrr', ) self.session.commit() self.session.add(item) @@ -1227,6 +1235,7 @@ class PagureLibtests(tests.Modeltests): user='pingou', requestfolder=None, ) + self.session.commit() self.assertEqual(msg, 'Request created') @patch('pagure.lib.notify.send_email') diff --git a/tests/test_progit_lib_git.py b/tests/test_progit_lib_git.py index dcbe768..79097c0 100644 --- a/tests/test_progit_lib_git.py +++ b/tests/test_progit_lib_git.py @@ -49,7 +49,8 @@ class PagureLibGittests(tests.Modeltests): user_id=1, # pingou name='test3', description='test project #2', - parent_id=1 + parent_id=1, + hook_token='aaabbbvvv', ) self.session.add(item) self.session.commit() @@ -277,6 +278,7 @@ index 9f44358..2a552bb 100644 user_id=1, # pingou name='test_ticket_repo', description='test project for ticket', + hook_token='aaabbbwww', ) self.session.add(item) self.session.commit() @@ -428,6 +430,7 @@ index 458821a..77674a8 user_id=1, # pingou name='test_ticket_repo', description='test project for ticket', + hook_token='aaabbbxxx', ) self.session.add(item) self.session.commit() @@ -477,7 +480,7 @@ index 0000000..60f7480 --- /dev/null +++ b/456 @@ -0,0 +1 @@ -+{"status": true, "branch_from": "feature", "uid": "foobar", "title": "test PR", "comments": [], "project": {"description": "test project for ticket", "parent": null, "settings": {"issue_tracker": true, "project_documentation": true, "pull_requests": true}, "user": {"fullname": "PY C", "name": "pingou", "emails": ["bar@pingou.com", "foo@pingou.com"]}, "date_created": null, "id": 1, "name": "test_ticket_repo"}, "commit_stop": null, "repo_from": {"description": "test project for ticket", "parent": null, "settings": {"issue_tracker": true, "project_documentation": true, "pull_requests": true}, "user": {"fullname": "PY C", "name": "pingou", "emails": ["bar@pingou.com", "foo@pingou.com"]}, "date_created": null, "id": 1, "name": "test_ticket_repo"}, "user": {"fullname": "PY C", "name": "pingou", "emails": ["bar@pingou.com", "foo@pingou.com"]}, "branch": "master", "date_created": null, "commit_start": null, "id": 1} ++{"status": true, "branch_from": "feature", "uid": "foobar", "title": "test PR", "comments": [], "project": {"description": "test project for ticket", "parent": null, "settings": {"Minimum_score_to_merge_pull-request": -1, "Web-hooks": null, "project_documentation": true, "pull_requests": true, "Only_assignee_can_merge_pull-request": false, "issue_tracker": true}, "user": {"fullname": "PY C", "name": "pingou", "emails": ["bar@pingou.com", "foo@pingou.com"]}, "date_created": null, "id": 1, "name": "test_ticket_repo"}, "commit_stop": null, "repo_from": {"description": "test project for ticket", "parent": null, "settings": {"Minimum_score_to_merge_pull-request": -1, "Web-hooks": null, "project_documentation": true, "pull_requests": true, "Only_assignee_can_merge_pull-request": false, "issue_tracker": true}, "user": {"fullname": "PY C", "name": "pingou", "emails": ["bar@pingou.com", "foo@pingou.com"]}, "date_created": null, "id": 1, "name": "test_ticket_repo"}, "user": {"fullname": "PY C", "name": "pingou", "emails": ["bar@pingou.com", "foo@pingou.com"]}, "branch": "master", "date_created": null, "commit_start": null, "id": 1} \ No newline at end of file """ diff --git a/tests/test_progit_lib_model.py b/tests/test_progit_lib_model.py index 03da18e..0409ae8 100644 --- a/tests/test_progit_lib_model.py +++ b/tests/test_progit_lib_model.py @@ -77,6 +77,7 @@ class PagureLibModeltests(tests.Modeltests): name='test', description='test project #1', parent_id=1, + hook_token='aaabbbyyy', ) self.session.commit() self.session.add(item)