From d2faf26a85f2d177818d0f638872dae3a0f2b91f Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Mar 19 2015 18:31:56 +0000 Subject: Adjust the unit-tests for the change update_git_ticket() to update_git() --- diff --git a/tests/test_progit_flask_ui_issues.py b/tests/test_progit_flask_ui_issues.py index fcff5e2..ed43ba8 100644 --- a/tests/test_progit_flask_ui_issues.py +++ b/tests/test_progit_flask_ui_issues.py @@ -50,7 +50,7 @@ class ProgitFlaskIssuestests(tests.Modeltests): tests.HERE, 'docs') self.app = progit.APP.test_client() - @patch('progit.lib.git.update_git_ticket') + @patch('progit.lib.git.update_git') @patch('progit.lib.notify.send_email') def test_new_issue(self, p_send_email, p_ugt): """ Test the new_issue endpoint. """ @@ -120,7 +120,7 @@ class ProgitFlaskIssuestests(tests.Modeltests): self.assertTrue('

test project #1

' in output.data) self.assertTrue('

\n Issues (1)\n

' in output.data) - @patch('progit.lib.git.update_git_ticket') + @patch('progit.lib.git.update_git') @patch('progit.lib.notify.send_email') def test_view_issues(self, p_send_email, p_ugt): """ Test the view_issues endpoint. """ @@ -179,7 +179,7 @@ class ProgitFlaskIssuestests(tests.Modeltests): output = self.app.get('/test/issues') self.assertEqual(output.status_code, 404) - @patch('progit.lib.git.update_git_ticket') + @patch('progit.lib.git.update_git') @patch('progit.lib.notify.send_email') def test_view_issue(self, p_send_email, p_ugt): """ Test the view_issue endpoint. """ @@ -272,7 +272,7 @@ class ProgitFlaskIssuestests(tests.Modeltests): output = self.app.get('/test/issue/1') self.assertEqual(output.status_code, 404) - @patch('progit.lib.git.update_git_ticket') + @patch('progit.lib.git.update_git') @patch('progit.lib.notify.send_email') def test_update_issue(self, p_send_email, p_ugt): """ Test the update_issue endpoint. """ @@ -498,7 +498,7 @@ class ProgitFlaskIssuestests(tests.Modeltests): output = self.app.get('/test/issue/1/update') self.assertEqual(output.status_code, 404) - @patch('progit.lib.git.update_git_ticket') + @patch('progit.lib.git.update_git') @patch('progit.lib.notify.send_email') def test_edit_issue(self, p_send_email, p_ugt): """ Test the edit_issue endpoint. """ @@ -596,7 +596,7 @@ class ProgitFlaskIssuestests(tests.Modeltests): output = self.app.post('/test/issue/1/edit', data=data) self.assertEqual(output.status_code, 404) - @patch('progit.lib.git.update_git_ticket') + @patch('progit.lib.git.update_git') @patch('progit.lib.notify.send_email') def test_edit_tag(self, p_send_email, p_ugt): """ Test the edit_tag endpoint. """ @@ -679,7 +679,7 @@ class ProgitFlaskIssuestests(tests.Modeltests): tags = progit.lib.get_tags_of_project(self.session, repo) self.assertEqual([tag.tag for tag in tags], ['tag2']) - @patch('progit.lib.git.update_git_ticket') + @patch('progit.lib.git.update_git') @patch('progit.lib.notify.send_email') def test_remove_tag(self, p_send_email, p_ugt): """ Test the remove_tag endpoint. """ diff --git a/tests/test_progit_lib.py b/tests/test_progit_lib.py index 37314f7..8ea19c5 100644 --- a/tests/test_progit_lib.py +++ b/tests/test_progit_lib.py @@ -130,7 +130,7 @@ class ProgitLibtests(tests.Modeltests): self.assertEqual( [], [email.email for email in items[1].emails]) - @patch('progit.lib.git.update_git_ticket') + @patch('progit.lib.git.update_git') @patch('progit.lib.notify.send_email') def test_new_issue(self, p_send_email, p_ugt): """ Test the new_issue of progit.lib. """ @@ -193,7 +193,7 @@ class ProgitLibtests(tests.Modeltests): issues = progit.lib.search_issues(self.session, repo) self.assertEqual(len(issues), 2) - @patch('progit.lib.git.update_git_ticket') + @patch('progit.lib.git.update_git') @patch('progit.lib.notify.send_email') def test_edit_issue(self, p_send_email, p_ugt): """ Test the edit_issue of progit.lib. """ @@ -233,7 +233,7 @@ class ProgitLibtests(tests.Modeltests): self.session.commit() self.assertEqual(msg, 'Edited successfully issue #2') - @patch('progit.lib.git.update_git_ticket') + @patch('progit.lib.git.update_git') @patch('progit.lib.notify.send_email') def test_add_issue_dependency(self, p_send_email, p_ugt): """ Test the add_issue_dependency of progit.lib. """ @@ -281,7 +281,7 @@ class ProgitLibtests(tests.Modeltests): self.assertEqual(len(issue_blocked.children), 1) self.assertEqual(issue_blocked.children[0].id, 1) - @patch('progit.lib.git.update_git_ticket') + @patch('progit.lib.git.update_git') @patch('progit.lib.notify.send_email') def test_add_issue_tag(self, p_send_email, p_ugt): """ Test the add_issue_tag of progit.lib. """ @@ -319,7 +319,7 @@ class ProgitLibtests(tests.Modeltests): self.assertEqual(issues[0].status, 'Open') self.assertEqual([tag.tag for tag in issues[0].tags], ['tag1']) - @patch('progit.lib.git.update_git_ticket') + @patch('progit.lib.git.update_git') @patch('progit.lib.notify.send_email') def test_remove_tags(self, p_send_email, p_ugt): """ Test the remove_tags of progit.lib. """ @@ -344,7 +344,7 @@ class ProgitLibtests(tests.Modeltests): self.assertEqual(msgs, [u'Removed tag: tag1']) - @patch('progit.lib.git.update_git_ticket') + @patch('progit.lib.git.update_git') @patch('progit.lib.notify.send_email') def test_edit_issue_tags(self, p_send_email, p_ugt): """ Test the edit_issue_tags of progit.lib. """ @@ -379,7 +379,7 @@ class ProgitLibtests(tests.Modeltests): old_tag='tag2', new_tag='tag2') - @patch('progit.lib.git.update_git_ticket') + @patch('progit.lib.git.update_git') @patch('progit.lib.notify.send_email') def test_search_issues(self, p_send_email, p_ugt): """ Test the search_issues of progit.lib. """ @@ -437,7 +437,7 @@ class ProgitLibtests(tests.Modeltests): self.assertEqual(issues[0].status, 'Invalid') self.assertEqual(issues[0].tags, []) - @patch('progit.lib.git.update_git_ticket') + @patch('progit.lib.git.update_git') @patch('progit.lib.notify.send_email') def test_add_issue_assignee(self, p_send_email, p_ugt): """ Test the add_issue_assignee of progit.lib. """ @@ -541,7 +541,7 @@ class ProgitLibtests(tests.Modeltests): self.session, repo, assignee=True) self.assertEqual(len(issues), 0) - @patch('progit.lib.git.update_git_ticket') + @patch('progit.lib.git.update_git') @patch('progit.lib.notify.send_email') def test_add_issue_comment(self, p_send_email, p_ugt): """ Test the add_issue_comment of progit.lib. """ diff --git a/tests/test_progit_lib_git.py b/tests/test_progit_lib_git.py index b3c6177..8c75631 100644 --- a/tests/test_progit_lib_git.py +++ b/tests/test_progit_lib_git.py @@ -254,8 +254,8 @@ index 9f44358..2a552bb 100644 self.assertEqual(patch, exp) @patch('progit.lib.notify.send_email') - def test_update_git_ticket(self, email_f): - """ Test the update_git_ticket of progit.lib.git. """ + def test_update_git(self, email_f): + """ Test the update_git of progit.lib.git. """ email_f.return_value = True # Create project @@ -284,7 +284,7 @@ index 9f44358..2a552bb 100644 ) self.assertEqual(msg, 'Issue created') issue = progit.lib.search_issues(self.session, repo, issueid=1) - progit.lib.git.update_git_ticket(issue, repo, tests.HERE) + progit.lib.git.update_git(issue, repo, tests.HERE) repo = pygit2.Repository(self.gitrepo) commit = repo.revparse_single('HEAD') diff --git a/tests/test_progit_lib_model.py b/tests/test_progit_lib_model.py index db9356d..62f0cc3 100644 --- a/tests/test_progit_lib_model.py +++ b/tests/test_progit_lib_model.py @@ -36,7 +36,7 @@ class ProgitLibModeltests(tests.Modeltests): self.assertEqual('foo', item.username) self.assertEqual([], item.groups) - @patch('progit.lib.git.update_git_ticket') + @patch('progit.lib.git.update_git') @patch('progit.lib.notify.send_email') def test_issue__repr__(self, p_send_email, p_ugt): """ Test the Issue.__repr__ function of progit.lib.model. """ @@ -63,7 +63,7 @@ class ProgitLibModeltests(tests.Modeltests): str(issues[0]), 'Issue(1, project:test, user:pingou, title:Test issue)') - @patch('progit.lib.git.update_git_ticket') + @patch('progit.lib.git.update_git') @patch('progit.lib.notify.send_email') def test_pullrequest__repr__(self, p_send_email, p_ugt): """ Test the PullRequest.__repr__ function of progit.lib.model. """