You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by di...@apache.org on 2022/09/01 13:43:22 UTC
[allura] 01/02: fixup! [#8458] audit log - discussion - log forum admin actions to auditlog
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8458
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 36dab0cbd1ce2b32190a884ea2e02208b0f46851
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Thu Sep 1 13:06:54 2022 +0000
fixup! [#8458] audit log - discussion - log forum admin actions to auditlog
---
.../forgediscussion/tests/functional/test_forum_admin.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py b/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py
index ca14d1c37..19babaca5 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py
@@ -15,11 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-import os
-import allura
import logging
-import PIL
+import re
from alluratest.controller import TestController
from allura.lib import helpers as h
from allura import model as M
@@ -43,6 +41,8 @@ class TestForumAdmin(TestController):
form['add_forum.name'] = 'Test Forum'
r = form.submit().follow()
assert 'Test Forum' in r
+ audit_log = M.AuditLog.query.find({'project_id': project._id}).sort('_id', -1).first()
+ assert 'created forum "Test Forum"' in audit_log.message
h.set_context('test', 'Forum', neighborhood='Projects')
frm = FM.Forum.query.get(shortname='testforum')
r = self.app.post('/admin/discussion/update_forums',
@@ -52,8 +52,8 @@ class TestForumAdmin(TestController):
'forum-0.shortname': 'NewTestForum',
'forum-0.description': 'My desc',
'forum-0.monitoring_email': ''})
- audit_log = M.AuditLog.query.find({'project_id': project._id}).sort('_id', -1).first()
- assert 'created forum "Test Forum"' in audit_log.message
+ audit_logs = M.AuditLog.query.find({'project_id': project._id, 'message': re.compile(' set option ')}).all()
+ assert len(audit_logs) == 4
r = self.app.get('/admin/discussion/forums')
assert 'New Test Forum' in r
assert 'My desc' in r