• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Aucun tag

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

allura


Commit MetaInfo

Révision0fa9abd94a7eeeb2af4374bd4f549fd9965d1d76 (tree)
l'heure2012-05-24 20:46:41
AuteurIgor Bondarenko <jetmind2@gmai...>
CommiterIgor Bondarenko

Message de Log

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

Change Summary

Modification

--- a/Allura/allura/templates/jinja_master/nav_menu.html
+++ b/Allura/allura/templates/jinja_master/nav_menu.html
@@ -1,5 +1,6 @@
11 {% 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) %}
34 <div id="nav_menu_missing"></div>
45 {% else %}
56 {% if c.project.neighborhood.icon %}
@@ -22,4 +23,4 @@
2223 {% endif %}
2324 </h1>
2425 </a>
25-{% endif %}
\ No newline at end of file
26+{% endif %}
--- a/Allura/allura/tests/functional/test_neighborhood.py
+++ b/Allura/allura/tests/functional/test_neighborhood.py
@@ -75,11 +75,13 @@ class TestNeighborhood(TestController):
7575 tracking_id='U-123456',
7676 show_title='false'),
7777 extra_environ=dict(username='root'))
78- r = self.app.get('/adobe/_admin/overview', extra_environ=dict(username='root'))
7978 # no title now
79+ r = self.app.get('/adobe/', extra_environ=dict(username='root'))
8080 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'))
8283 assert 'class="project_title"' not in str(r)
84+
8385 # title must be present on project page
8486 r = self.app.get('/adobe/adobe-1/admin/',
8587 extra_environ=dict(username='root'))