You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/05/24 20:17:50 UTC
[14/50] git commit: [#5571] ticket:354 Restore 'unmoderated_post'
check
[#5571] ticket:354 Restore 'unmoderated_post' check
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/24b311f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/24b311f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/24b311f9
Branch: refs/heads/db/6007
Commit: 24b311f99f45313e8e647123dc0b49f34a3e1bc6
Parents: 639c292
Author: Igor Bondarenko <je...@gmail.com>
Authored: Thu May 16 10:27:38 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Wed May 22 20:54:26 2013 +0000
----------------------------------------------------------------------
Allura/allura/model/discuss.py | 2 +-
Allura/allura/tests/model/test_discussion.py | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/24b311f9/Allura/allura/model/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py
index 26ed77e..0e3e90c 100644
--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -265,7 +265,7 @@ class Thread(Artifact, ActivityObject):
if message_id is not None:
kwargs['_id'] = message_id
post = self.post_class()(**kwargs)
- if ignore_security or not self.is_spam(post):
+ if ignore_security or not self.is_spam(post) and has_access(self, 'unmoderated_post')():
log.info('Auto-approving message from %s', c.user.username)
file_info = kw.get('file_info', None)
post.approve(file_info, notify=kw.get('notify', True))
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/24b311f9/Allura/allura/tests/model/test_discussion.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_discussion.py b/Allura/allura/tests/model/test_discussion.py
index 774a864..8afaf6e 100644
--- a/Allura/allura/tests/model/test_discussion.py
+++ b/Allura/allura/tests/model/test_discussion.py
@@ -399,7 +399,8 @@ def test_not_spam_and_has_unmoderated_post_permission(spam_checker):
@with_setup(setUp, tearDown)
@mock.patch('allura.controllers.discuss.g.spam_checker')
-def test_not_spam_but_has_no_unmoderated_post_permission(spam_checker):
+@mock.patch.object(M.Thread, 'notify_moderators')
+def test_not_spam_but_has_no_unmoderated_post_permission(spam_checker, notify_moderators):
spam_checker.check.return_value = False
d = M.Discussion(shortname='test', name='test')
t = M.Thread(discussion_id=d._id, subject='Test Thread')
@@ -409,6 +410,7 @@ def test_not_spam_but_has_no_unmoderated_post_permission(spam_checker):
with h.push_config(c, user=M.User.anonymous()):
post = t.post('Hey')
assert_equal(post.status, 'pending')
+ notify_moderators.assert_called_once()
@with_setup(setUp, tearDown)