allura
Fork

Commit

Revisión	0fa9abd94a7eeeb2af4374bd4f549fd9965d1d76 (tree)
Tiempo	2012-05-24 20:46:41
Autor	Igor Bondarenko <jetmind2@gmai...>
Commiter	Igor Bondarenko

[#4187] ticket:69 expand test and fix functionality

--- a/Allura/allura/templates/jinja_master/nav_menu.html

+++ b/Allura/allura/templates/jinja_master/nav_menu.html

		@@ -1,5 +1,6 @@
1	1	{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
2		-{% if not c.project or not c.project.neighborhood.show_title %}
	2	+{% set n = c.project.neighborhood %}
	3	+{% if not c.project or (n.neighborhood_project == c.project and not n.show_title) %}
3	4	<div id="nav_menu_missing"></div>
4	5	{% else %}
5	6	{% if c.project.neighborhood.icon %}

--- a/Allura/allura/tests/functional/test_neighborhood.py

+++ b/Allura/allura/tests/functional/test_neighborhood.py

		@@ -75,11 +75,13 @@ class TestNeighborhood(TestController):
75	75	tracking_id='U-123456',
76	76	show_title='false'),
77	77	extra_environ=dict(username='root'))
78		- r = self.app.get('/adobe/_admin/overview', extra_environ=dict(username='root'))
79	78	# no title now
	79	+ r = self.app.get('/adobe/', extra_environ=dict(username='root'))
80	80	assert 'class="project_title"' not in str(r)
81		- r = self.app.get('/adobe', extra_environ=dict(username='root'))
	81	+ r = self.app.get('/adobe/wiki/Home/',
	82	+ extra_environ=dict(username='root'))
82	83	assert 'class="project_title"' not in str(r)
	84	+
83	85	# title must be present on project page
84	86	r = self.app.get('/adobe/adobe-1/admin/',
85	87	extra_environ=dict(username='root'))