Commit: b1b7275819da55b40d85085209aa7e1bf318f7e6 - allura (git)

allura

Commit MetaInfo

• Revision: b1b7275819da55b40d85085209aa7e1bf318f7e6 (tree)
• Zeit: 2012-05-11 06:40:41
• Autor: Dave Brondsema <dbrondsema@geek...>
• Commiter: Cory Johns

Log Message

[#4063] add nbhd help page for the projects macro

Ändern Zusammenfassung

• modified: Allura/allura/controllers/project.py
• modified: Allura/allura/ext/admin/admin_main.py
• modified: Allura/allura/tests/functional/test_neighborhood.py

Diff

--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -558,7 +558,6 @@ class NeighborhoodStatsController(object):
                     neighborhood=self.neighborhood,
                     )
 
-
 class NeighborhoodModerateController(object):
 
     def __init__(self, neighborhood):

--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -1,9 +1,7 @@
 import logging
 from collections import defaultdict
-from datetime import datetime, timedelta
+from datetime import datetime
 
-import Image
-import pymongo
 import pkg_resources
 from pylons import c, g, request
 from paste.deploy.converters import asbool

--- a/Allura/allura/tests/functional/test_neighborhood.py
+++ b/Allura/allura/tests/functional/test_neighborhood.py
@@ -614,3 +614,7 @@ class TestNeighborhood(TestController):
     def test_profile_topnav_menu(self):
         r = self.app.get('/u/test-user/', extra_environ=dict(username='test-user')).follow()
         assert '<a href="/u/test-user/profile/" class="ui-icon-tool-home">' in r
+
+    def test_help(self):
+        r = self.app.get('/p/_admin/help/', extra_environ=dict(username='root'))
+        assert 'macro' in r