Commit: f2fb1b1b4b8ac720212ad144626f8b6d469d7ab6 - allura (git)

allura

Commit MetaInfo

• Revisão: f2fb1b1b4b8ac720212ad144626f8b6d469d7ab6 (tree)
• Hora: 2010-05-27 04:24:56
• Autor: Rick Copeland <rcopeland@geek...>
• Commiter: Rick Copeland

Mensagem de Log

[#461] - Add and fix tests

Mudança Sumário

• modified: pyforge/pyforge/controllers/root.py
• modified: pyforge/pyforge/lib/plugin.py
• modified: pyforge/pyforge/tests/functional/test_neighborhood.py
• modified: pyforge/pyforge/tests/functional/test_root.py
• modified: pyforge/pyforge/tests/model/test_notification.py
• modified: pyforge/pyforge/websetup/bootstrap.py

Diff

--- a/pyforge/pyforge/controllers/root.py
+++ b/pyforge/pyforge/controllers/root.py
@@ -76,7 +76,12 @@ class RootController(BaseController):
     def index(self):
         """Handle the front-page."""
         c.project_summary = W.project_summary
-        psort = [(n, M.Project.query.find(dict(is_root=True, neighborhood_id=n._id, deleted=False)).sort('shortname').all())
+        psort = [
+            (n, M.Project.query.find(
+                    dict(is_root=True,
+                         shortname={'$ne':'__init__'},
+                         neighborhood_id=n._id,
+                         deleted=False)).sort('shortname').all())
                  for n in M.Neighborhood.query.find().sort('name')]
         categories = M.ProjectCategory.query.find({'parent_id':None}).sort('name').all()
         c.custom_sidebar_menu = [SitemapEntry('Categories')] + [

--- a/pyforge/pyforge/lib/plugin.py
+++ b/pyforge/pyforge/lib/plugin.py
@@ -221,8 +221,9 @@ class ProjectRegistrationProvider(object):
                         pr = user.project_role()
                         pr.roles = [ role_owner._id, role_developer._id, role_member._id ]
                         # Setup builtin tool applications
-                        p.install_app('wiki', 'home')
-                        p.install_app('admin', 'admin')
+                with h.push_config(c, user=users[0]):
+                    p.install_app('wiki', 'home')
+                    p.install_app('admin', 'admin')
                 ThreadLocalORMSession.flush_all()
         except:
             ThreadLocalORMSession.close_all()

--- a/pyforge/pyforge/tests/functional/test_neighborhood.py
+++ b/pyforge/pyforge/tests/functional/test_neighborhood.py
@@ -9,6 +9,23 @@ from pyforge.tests import TestController
 
 class TestNeighborhood(TestController):
 
+    def test_home_project(self):
+        r = self.app.get('/adobe/home/')
+        assert r.location.endswith('/adobe/home/HomeHome/')
+        r = r.follow()
+        assert 'Welcome' in str(r), str(r)
+        r = self.app.get('/adobe/admin/')
+        assert r.location.endswith('/adobe/admin/overview')
+        r = r.follow()
+        assert 'admin' in str(r), str(r)
+
+    def test_redirect(self):
+        r = self.app.post('/adobe/_admin/update',
+                          params=dict(redirect='home/HomeHome/'),
+                          extra_environ=dict(username='root'))
+        r = self.app.get('/adobe/')
+        assert r.location.endswith('/adobe/home/HomeHome/')
+
     def test_admin(self):
         r = self.app.get('/adobe/_admin/', extra_environ=dict(username='root'))
         r = self.app.post('/adobe/_admin/update_acl',

--- a/pyforge/pyforge/tests/functional/test_root.py
+++ b/pyforge/pyforge/tests/functional/test_root.py
@@ -21,7 +21,7 @@ class TestRootController(TestController):
         response = self.app.get('/')
         assert response.html.find('h1').string == 'All Projects'
         projects = response.html.findAll('ul',{'class':'display'})[0].findAll('li')
-        assert len(projects) == 10
+        assert len(projects) == 10, len(projects)
         assert projects[0].find('a').get('href') == '/adobe/'
         assert projects[1].find('img').get('alt') == 'adobe_1 Icon'
         cat_links = response.html.find('ul',{'id':'sidebarmenu'}).findAll('li')

--- a/pyforge/pyforge/tests/model/test_notification.py
+++ b/pyforge/pyforge/tests/model/test_notification.py
@@ -168,5 +168,6 @@ def _clear_subscriptions():
         for s in subs.subscriptions:
             M.Mailbox.query.remove(dict(_id=s.mailbox_id))
         subs.subscriptions = []
+        M.Mailbox.query.remove({})
 
 

--- a/pyforge/pyforge/websetup/bootstrap.py
+++ b/pyforge/pyforge/websetup/bootstrap.py
@@ -91,9 +91,9 @@ def bootstrap(command, conf, vars):
                              acl=dict(read=[None], create=[],
                                       moderate=[root._id], admin=[root._id]))
     project_reg = plugin.ProjectRegistrationProvider.get()
-    p_projects = project_reg.register_neighborhood_project(n_projects, root)
-    p_users = project_reg.register_neighborhood_project(n_users, root)
-    p_adobe = project_reg.register_neighborhood_project(n_adobe, root)
+    p_projects = project_reg.register_neighborhood_project(n_projects, [root])
+    p_users = project_reg.register_neighborhood_project(n_users, [root])
+    p_adobe = project_reg.register_neighborhood_project(n_adobe, [root])
     M.Theme(name='forge_default',
             label='Default Forge Theme',
             color1='#0088cc',