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 2016/02/05 20:12:51 UTC
[4/6] allura git commit: [#7921] ticket:887 fix tests,
delete deprecated tests
[#7921] ticket:887 fix tests, delete deprecated tests
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/6e2f4422
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/6e2f4422
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/6e2f4422
Branch: refs/heads/master
Commit: 6e2f4422fff3b8a17a154d574888106828a511ab
Parents: 459003d
Author: Denis Kotov <de...@gmail.com>
Authored: Fri Jan 15 16:40:53 2016 +0200
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Feb 5 13:28:48 2016 -0500
----------------------------------------------------------------------
Allura/allura/tests/functional/test_admin.py | 69 --------------------
.../tests/functional/test_neighborhood.py | 25 ++++---
2 files changed, 16 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/6e2f4422/Allura/allura/tests/functional/test_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_admin.py b/Allura/allura/tests/functional/test_admin.py
index cff3c70..0c58545 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -50,11 +50,6 @@ log = logging.getLogger(__name__)
class TestProjectAdmin(TestController):
- def get_available_tools(self):
- r = self.app.get('/admin/tools')
- available_tools = r.html.findAll('a', {'class': 'install_trig'})
- return [' '.join(opt.find('span').string.strip().split()) for opt in available_tools]
-
def test_admin_controller(self):
self.app.get('/admin/')
with audits(
@@ -336,54 +331,6 @@ class TestProjectAdmin(TestController):
tag['name'].endswith('.id'))]
assert len(cards) == len(app.permissions), cards
- def test_tool_list(self):
- r = self.app.get('/admin/tools')
- new_ep_opts = r.html.findAll('a', {'class': "install_trig"})
- tool_strings = [' '.join(opt.find('span').string.strip().split())
- for opt in new_ep_opts]
- expected_tools = [
- 'Wiki',
- 'Tickets',
- 'Discussion',
- 'Blog',
- 'Subproject']
- # check using sets, because their may be more tools installed by default
- # that we don't know about
- assert len(set(expected_tools) - set(tool_strings)) == 0, tool_strings
-
- def test_tool_paging(self):
- r = self.app.get('/admin/tools')
- items = r.html.findAll('ul', {'class': 'deck'})
- # sometimes the activity tool is present, sometimes it isn't - not sure why
- assert_in(len(items), (2, 3))
- r = self.app.get('/admin/tools?limit=1&page=0')
- assert_equals(1, len(r.html.findAll('ul', {'class': 'deck'})))
- r = self.app.get('/admin/tools?limit=1&page=1')
- assert_equals(1, len(r.html.findAll('ul', {'class': 'deck'})))
-
- def test_tool_installation_limit(self):
- with mock.patch.object(ForgeWikiApp, 'max_instances') as mi:
- mi.__get__ = mock.Mock(return_value=1)
-
- available_tools = self.get_available_tools()
- assert_in('Wiki', available_tools)
- r = self.app.post('/admin/update_mounts/', params={
- 'new.install': 'install',
- 'new.ep_name': 'Wiki',
- 'new.ordinal': '1',
- 'new.mount_point': 'wiki',
- 'new.mount_label': 'Wiki'})
- available_tools = self.get_available_tools()
- assert_not_in('Wiki', available_tools)
- r = self.app.post('/admin/update_mounts/', params={
- 'new.install': 'install',
- 'new.ep_name': 'Wiki',
- 'new.ordinal': '1',
- 'new.mount_point': 'wiki2',
- 'new.mount_label': 'Wiki 2'})
- assert 'error' in self.webflash(r)
- assert 'limit exceeded' in self.webflash(r)
-
def test_install_tool_form(self):
r = self.app.get('/admin/install_tool?tool_name=wiki')
assert_in(u'Installing Wiki', r)
@@ -398,22 +345,6 @@ class TestProjectAdmin(TestController):
r = self.app.get('/admin/install_tool?tool_name=subproject')
assert_in(u'Installing Sub Project', r)
- def test_grouping_threshold(self):
- r = self.app.get('/admin/tools')
- grouping_threshold = r.html.find(
- 'input', {'name': 'grouping_threshold'})
- assert_equals(grouping_threshold['value'], '1')
- r = self.app.post('/admin/configure_tool_grouping', params={
- 'grouping_threshold': '2',
- }).follow()
- grouping_threshold = r.html.find(
- 'input', {'name': 'grouping_threshold'})
- assert_equals(grouping_threshold['value'], '2')
- r = self.app.get('/admin/tools')
- grouping_threshold = r.html.find(
- 'input', {'name': 'grouping_threshold'})
- assert_equals(grouping_threshold['value'], '2')
-
def test_project_icon(self):
file_name = 'neo-icon-set-454545-256x350.png'
file_path = os.path.join(
http://git-wip-us.apache.org/repos/asf/allura/blob/6e2f4422/Allura/allura/tests/functional/test_neighborhood.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_neighborhood.py b/Allura/allura/tests/functional/test_neighborhood.py
index a7609df..5441f8c 100644
--- a/Allura/allura/tests/functional/test_neighborhood.py
+++ b/Allura/allura/tests/functional/test_neighborhood.py
@@ -19,6 +19,7 @@ import json
import os
from cStringIO import StringIO
import urllib2
+import re
import PIL
from mock import patch
@@ -126,9 +127,12 @@ class TestNeighborhood(TestController):
r = self.app.get('/p/_admin/overview', extra_environ=dict(username='root'))
assert 'wiki, tickets' in r
- r = self.app.get('/p/test/admin/tools')
- assert ' <span class="tool_title">Wiki</span><br />' not in r
- assert ' <span class="tool_title">Tickets</span><br />' not in r
+ r = self.app.get('/p/test/admin/overview')
+ c = re.compile('var _data = .*;')
+ _data = json.loads(c.search(str(r.html)).group()[12:-1])
+ tools = [tool['name'] for tool in _data['menu']]
+ assert 'Wiki' not in tools
+ assert 'Tickets' not in tools
r = self.app.post('/p/_admin/update',
params=dict(name='Projects',
@@ -171,11 +175,14 @@ class TestNeighborhood(TestController):
assert top_nav.find(href='/p/test/wiki/'), top_nav
assert top_nav.find(href='/p/test/tickets/'), top_nav
- r = self.app.get('/p/test/admin/tools')
- assert '<div class="fleft isnt_sorted">' in r
- delete_tool = [link for link in r.html.findAll('a', {'class': 'admin_modal'})
- if link['href'].endswith('/delete')]
- assert_equal(len(delete_tool), 0) # wiki not deletable
+ r = self.app.get('/p/test/admin/overview')
+ c = re.compile('var _data = .*;')
+ _data = json.loads(c.search(str(r.html)).group()[12:-1])
+ for tool in _data['menu']:
+ if tool['name'].lower() == 'wiki':
+ menu = [name['text'] for name in tool['admin_options']]
+ assert 'Delete' not in menu
+ break
def test_show_title(self):
r = self.app.get('/adobe/_admin/overview',
@@ -809,7 +816,7 @@ class TestNeighborhood(TestController):
private_project='off'),
antispam=True,
extra_environ=dict(username='root'))
- r = self.app.get('/adobe/testtemp/admin/tools')
+ r = self.app.get('/adobe/testtemp/admin/overview')
assert r.html.find('div', id='top_nav').find(
'a', href='/adobe/testtemp/wiki/'), r.html
assert r.html.find('div', id='top_nav').find(