From 668fbd63f7152bcddfedb0bdd4bc506d61b6783a Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jul 08 2015 14:25:01 +0000 Subject: Adjust unit-tests from the old to the new methods to handle tags --- diff --git a/tests/test_progit_flask_dump_load_ticket.py b/tests/test_progit_flask_dump_load_ticket.py index 384709d..4b585b3 100644 --- a/tests/test_progit_flask_dump_load_ticket.py +++ b/tests/test_progit_flask_dump_load_ticket.py @@ -134,9 +134,9 @@ class PagureFlaskDumpLoadTicketTests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'Issue assigned') # Add a couple of tags on the ticket - msg = pagure.lib.add_issue_tag( + msg = pagure.lib.add_tag_obj( session=self.session, - issue=issue, + obj=issue, tags=[' feature ', 'future '], user='pingou', ticketfolder=repopath, diff --git a/tests/test_progit_flask_ui_issues.py b/tests/test_progit_flask_ui_issues.py index 4a99287..663adb3 100644 --- a/tests/test_progit_flask_ui_issues.py +++ b/tests/test_progit_flask_ui_issues.py @@ -1179,9 +1179,9 @@ class PagureFlaskIssuestests(tests.Modeltests): # Add a tag to the issue issue = pagure.lib.search_issues(self.session, repo, issueid=1) - msg = pagure.lib.add_issue_tag( + msg = pagure.lib.add_tag_obj( session=self.session, - issue=issue, + obj=issue, tags='tag1', user='pingou', ticketfolder=None) @@ -1264,9 +1264,9 @@ class PagureFlaskIssuestests(tests.Modeltests): # Add a tag to the issue issue = pagure.lib.search_issues(self.session, repo, issueid=1) - msg = pagure.lib.add_issue_tag( + msg = pagure.lib.add_tag_obj( session=self.session, - issue=issue, + obj=issue, tags='tag1', user='pingou', ticketfolder=None) diff --git a/tests/test_progit_lib.py b/tests/test_progit_lib.py index 5242aed..3120a38 100644 --- a/tests/test_progit_lib.py +++ b/tests/test_progit_lib.py @@ -305,8 +305,8 @@ class PagureLibtests(tests.Modeltests): @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email') - def test_add_issue_tag(self, p_send_email, p_ugt): - """ Test the add_issue_tag of pagure.lib. """ + def test_add_tag_obj(self, p_send_email, p_ugt): + """ Test the add_tag_obj of pagure.lib. """ p_send_email.return_value = True p_ugt.return_value = True @@ -315,9 +315,9 @@ class PagureLibtests(tests.Modeltests): issue = pagure.lib.search_issues(self.session, repo, issueid=1) # Add a tag to the issue - msg = pagure.lib.add_issue_tag( + msg = pagure.lib.add_tag_obj( session=self.session, - issue=issue, + obj=issue, tags='tag1', user='pingou', ticketfolder=None) @@ -325,9 +325,9 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msg, 'Tag added: tag1') # Try a second time - msg = pagure.lib.add_issue_tag( + msg = pagure.lib.add_tag_obj( session=self.session, - issue=issue, + obj=issue, tags='tag1', user='pingou', ticketfolder=None) @@ -348,7 +348,7 @@ class PagureLibtests(tests.Modeltests): p_send_email.return_value = True p_ugt.return_value = True - self.test_add_issue_tag() + self.test_add_tag_obj() repo = pagure.lib.get_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) @@ -372,18 +372,18 @@ class PagureLibtests(tests.Modeltests): @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email') - def test_remove_tags_issue(self, p_send_email, p_ugt): - """ Test the remove_tags_issue of pagure.lib. """ + def test_remove_tags_obj(self, p_send_email, p_ugt): + """ Test the remove_tags_obj of pagure.lib. """ p_send_email.return_value = True p_ugt.return_value = True - self.test_add_issue_tag() + self.test_add_tag_obj() repo = pagure.lib.get_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) - msgs = pagure.lib.remove_tags_issue( + msgs = pagure.lib.remove_tags_obj( session=self.session, - issue=issue, + obj=issue, tags='tag1', user='pingou', ticketfolder=None) @@ -397,7 +397,7 @@ class PagureLibtests(tests.Modeltests): p_send_email.return_value = True p_ugt.return_value = True - self.test_add_issue_tag() + self.test_add_tag_obj() repo = pagure.lib.get_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) @@ -424,9 +424,9 @@ class PagureLibtests(tests.Modeltests): self.assertEqual(msgs, ['Edited tag: tag1 to tag2']) # Add a new tag - msg = pagure.lib.add_issue_tag( + msg = pagure.lib.add_tag_obj( session=self.session, - issue=issue, + obj=issue, tags='tag3', user='pingou', ticketfolder=None) @@ -961,7 +961,7 @@ class PagureLibtests(tests.Modeltests): def test_get_tags_of_project(self): """ Test the get_tags_of_project of pagure.lib. """ - self.test_add_issue_tag() + self.test_add_tag_obj() repo = pagure.lib.get_project(self.session, 'test') tags = pagure.lib.get_tags_of_project(self.session, repo) @@ -1564,8 +1564,8 @@ class PagureLibtests(tests.Modeltests): @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email') - def test_update_tags_issue(self, p_send_email, p_ugt): - """ Test the update_tags_issue of pagure.lib. """ + def test_update_tags_object(self, p_send_email, p_ugt): + """ Test the update_tags_object of pagure.lib. """ p_send_email.return_value = True p_ugt.return_value = True @@ -1576,10 +1576,10 @@ class PagureLibtests(tests.Modeltests): # before self.assertEqual(issue.tags_text, []) - messages = pagure.lib.update_tags_issue( + messages = pagure.lib.update_tags_object( self.session, issue, 'tag', 'pingou', ticketfolder=None) self.assertEqual(messages, ['Tag added: tag']) - messages = pagure.lib.update_tags_issue( + messages = pagure.lib.update_tags_object( self.session, issue, ['tag2', 'tag3'], 'pingou', ticketfolder=None) self.assertEqual(