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 2014/09/17 15:34:03 UTC
[16/35] git commit: [#7657] ticket:650 Fix tests
[#7657] ticket:650 Fix tests
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/57fcd18e
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/57fcd18e
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/57fcd18e
Branch: refs/heads/je/42cc_7657
Commit: 57fcd18e02ad084549307635e72aa381de288496
Parents: 4178656
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Sep 12 15:17:59 2014 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Wed Sep 17 16:09:29 2014 +0300
----------------------------------------------------------------------
.../allura/tests/functional/test_site_admin.py | 77 +++++++++-----------
1 file changed, 34 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/57fcd18e/Allura/allura/tests/functional/test_site_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_site_admin.py b/Allura/allura/tests/functional/test_site_admin.py
index 9a0c7af..6c418d6 100644
--- a/Allura/allura/tests/functional/test_site_admin.py
+++ b/Allura/allura/tests/functional/test_site_admin.py
@@ -167,49 +167,6 @@ class TestSiteAdmin(TestController):
task_name='allura.tests.functional.test_site_admin.test_task'))
assert json.loads(r.body)['doc'] == 'test_task doc string'
- @patch('allura.model.auth.request')
- def test_users(self, request):
- request.url = 'http://host.domain/path/'
- c.user = M.User.by_username('test-user-1')
- h.auditlog_user('test activity user 1')
- h.auditlog_user('test activity user 2', user=M.User.by_username('test-user-2'))
- r = self.app.get('/nf/admin/users')
- assert_not_in('test activity', r)
- r = self.app.get('/nf/admin/users?username=admin1')
- assert_not_in('test activity', r)
- r = self.app.get('/nf/admin/users?username=test-user-1')
- assert_in('test activity user 1', r)
- assert_not_in('test activity user 2', r)
- r = self.app.get('/nf/admin/users?username=test-user-2')
- assert_not_in('test activity user 1', r)
- assert_in('test activity user 2', r)
-
- def test_add_audit_trail_entry_access(self):
- self.app.get('/nf/admin/add_audit_log_entry', status=404) # GET is not allowed
- r = self.app.post('/nf/admin/add_audit_log_entry',
- extra_environ={'username': '*anonymous'},
- status=302)
- assert_equal(r.location, 'http://localhost/auth/')
-
- def test_add_comment_on_users_trail_page(self):
- r = self.app.get('/nf/admin/users')
- assert_not_in('Add comment', r)
- r = self.app.get('/nf/admin/users?username=fake-user')
- assert_not_in('Add comment', r)
- r = self.app.get('/nf/admin/users?username=test-user')
- assert_in('Add comment', r)
-
- def test_add_comment(self):
- r = self.app.get('/nf/admin/users?username=test-user')
- assert_not_in(u'Comment by test-admin: I was hêre!', r)
- form = r.forms[1]
- assert_equal(form['username'].value, 'test-user')
- form['comment'] = u'I was hêre!'
- r = form.submit()
- assert_in(u'Comment added', self.webflash(r))
- r = self.app.get('/nf/admin/users?username=test-user')
- assert_in(u'Comment by test-admin: I was hêre!', r)
-
class TestProjectsSearch(TestController):
@@ -297,6 +254,40 @@ class TestUserDetails(TestController):
assert_in('Test Project', projects)
assert_in('Adobe project 1', projects)
+ @patch('allura.model.auth.request')
+ def test_audit_log(self, request):
+ request.url = 'http://host.domain/path/'
+ c.user = M.User.by_username('test-user-1')
+ h.auditlog_user('test activity user 1')
+ h.auditlog_user('test activity user 2', user=M.User.by_username('test-user-2'))
+ r = self.app.get('/nf/admin/user/test-admin')
+ assert_in('Add comment', r)
+ assert_not_in('test activity', r)
+ r = self.app.get('/nf/admin/user/test-user-1')
+ assert_in('test activity user 1', r)
+ assert_not_in('test activity user 2', r)
+ r = self.app.get('/nf/admin/user/test-user-2')
+ assert_not_in('test activity user 1', r)
+ assert_in('test activity user 2', r)
+
+ def test_add_audit_trail_entry_access(self):
+ self.app.get('/nf/admin/user/add_audit_log_entry', status=404) # GET is not allowed
+ r = self.app.post('/nf/admin/user/add_audit_log_entry',
+ extra_environ={'username': '*anonymous'},
+ status=302)
+ assert_equal(r.location, 'http://localhost/auth/')
+
+ def test_add_comment(self):
+ r = self.app.get('/nf/admin/user/test-user')
+ assert_not_in(u'Comment by test-admin: I was hêre!', r)
+ form = r.forms[0]
+ assert_equal(form['username'].value, 'test-user')
+ form['comment'] = u'I was hêre!'
+ r = form.submit()
+ assert_in(u'Comment added', self.webflash(r))
+ r = self.app.get('/nf/admin/user/test-user')
+ assert_in(u'Comment by test-admin: I was hêre!', r)
+
@task
def test_task(*args, **kw):