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/18 09:30:17 UTC
[42/43] git commit: [#7656] ticket:654 Fix tests
[#7656] ticket:654 Fix tests
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/f6dd4ef4
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/f6dd4ef4
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/f6dd4ef4
Branch: refs/heads/je/42cc_7656
Commit: f6dd4ef42d99194fd767869ccfbc0a6844fdf65d
Parents: d967e79
Author: Igor Bondarenko <je...@gmail.com>
Authored: Thu Sep 18 09:40:49 2014 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Thu Sep 18 09:40:49 2014 +0300
----------------------------------------------------------------------
Allura/allura/tests/functional/test_site_admin.py | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/f6dd4ef4/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 c8b3bad..5b0a9b0 100644
--- a/Allura/allura/tests/functional/test_site_admin.py
+++ b/Allura/allura/tests/functional/test_site_admin.py
@@ -167,8 +167,9 @@ class TestSiteAdmin(TestController):
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/'
+ @patch('allura.lib.helpers.request')
+ def test_users(self, req1, req2):
+ req1.url = req2.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'))
@@ -255,13 +256,13 @@ class TestProjectsSearch(TestController):
@patch('allura.controllers.site_admin.search')
def test_additional_fields(self, search):
search.site_admin_search.return_value = self.TEST_HIT
- with h.push_config(config, **{'search.project.additional_fields': 'private, url'}):
+ with h.push_config(config, **{'search.project.additional_search_fields': 'private, url',
+ 'search.project.additional_display_fields': 'url'}):
r = self.app.get('/nf/admin/search_projects?q=fake&f=shortname')
options = [o['value'] for o in r.html.findAll('option')]
assert_equal(options, ['shortname', 'name', 'private', 'url', '__custom__'])
ths = [th.text for th in r.html.findAll('th')]
- assert_equal(ths, ['Short name', 'Full name', 'Registered', 'Deleted?',
- 'private', 'url', 'Details'])
+ assert_equal(ths, ['Short name', 'Full name', 'Registered', 'Deleted?', 'url', 'Details'])
class TestUsersSearch(TestController):
@@ -308,13 +309,14 @@ class TestUsersSearch(TestController):
@patch('allura.controllers.site_admin.search')
def test_additional_fields(self, search):
search.site_admin_search.return_value = self.TEST_HIT
- with h.push_config(config, **{'search.user.additional_fields': 'email_addresses, url'}):
+ with h.push_config(config, **{'search.user.additional_search_fields': 'email_addresses, url',
+ 'search.user.additional_display_fields': 'url'}):
r = self.app.get('/nf/admin/search_users?q=fake&f=username')
options = [o['value'] for o in r.html.findAll('option')]
assert_equal(options, ['username', 'display_name', 'email_addresses', 'url', '__custom__'])
ths = [th.text for th in r.html.findAll('th')]
assert_equal(ths, ['Username', 'Display name', 'Email', 'Registered',
- 'Disabled?', 'email_addresses', 'url', 'Details'])
+ 'Disabled?', 'url', 'Details'])
@task