You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/04/21 11:33:36 UTC
[09/14] allura git commit: [#7866] ticket:754 Rewrite can_merge tests
[#7866] ticket:754 Rewrite can_merge tests
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/b76a9492
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/b76a9492
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/b76a9492
Branch: refs/heads/ib/7866
Commit: b76a9492d3664e56fe9a9b4f6570f2f439c000e5
Parents: 13ba80e
Author: Igor Bondarenko <je...@gmail.com>
Authored: Sat Apr 18 12:23:37 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue Apr 21 08:15:32 2015 +0000
----------------------------------------------------------------------
Allura/allura/tests/model/test_repo.py | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/b76a9492/Allura/allura/tests/model/test_repo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_repo.py b/Allura/allura/tests/model/test_repo.py
index 54a30a6..d083675 100644
--- a/Allura/allura/tests/model/test_repo.py
+++ b/Allura/allura/tests/model/test_repo.py
@@ -760,15 +760,22 @@ class TestMergeRequest(object):
self.mr.set_can_merge_cache(False)
assert_equal(self.mr.can_merge_cache, {key: True, '123-123': False})
- def test_can_merge(self):
- assert_equal(self.mr.can_merge(),
- self.mr.app.repo.can_merge.return_value)
- self.mr.app.repo.can_merge.assert_called_once_with(self.mr)
+ def test_can_merge_merged(self):
+ self.mr.status = 'merged'
+ assert_equal(self.mr.can_merge(), True)
- self.mr.app.reset_mock()
- self.mr.app.forkable = False
+ @mock.patch('allura.tasks.repo_tasks.can_merge', autospec=True)
+ def test_can_merge_cached(self, can_merge_task):
+ self.mr.set_can_merge_cache(False)
assert_equal(self.mr.can_merge(), False)
- assert_equal(self.mr.app.repo.can_merge.called, False)
+ self.mr.set_can_merge_cache(True)
+ assert_equal(self.mr.can_merge(), True)
+ assert_equal(can_merge_task.post.call_count, 0)
+
+ @mock.patch('allura.tasks.repo_tasks.can_merge', autospec=True)
+ def test_can_merge_not_cached(self, can_merge_task):
+ assert_equal(self.mr.can_merge(), None)
+ can_merge_task.post.assert_called_once_with(self.mr._id)
@mock.patch('allura.tasks.repo_tasks.merge', autospec=True)
def test_merge(self, merge_task):
@@ -788,3 +795,11 @@ class TestMergeRequest(object):
assert_equal(self.mr.merge_task_status(), 'ready')
M.MonQTask.run_ready()
assert_equal(self.mr.merge_task_status(), 'complete')
+
+ def test_can_merge_task_status(self):
+ from allura.tasks import repo_tasks
+ assert_equal(self.mr.can_merge_task_status(), None)
+ repo_tasks.can_merge.post(self.mr._id)
+ assert_equal(self.mr.can_merge_task_status(), 'ready')
+ M.MonQTask.run_ready()
+ assert_equal(self.mr.can_merge_task_status(), 'complete')