allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [48/50] git commit: [#6007] Give full names to the default projects
Date Fri, 24 May 2013 18:18:24 GMT
[#6007] Give full names to the default projects


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/76884ad7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/76884ad7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/76884ad7

Branch: refs/heads/db/6007
Commit: 76884ad7234d730c1676c61532d77ad34dbd247a
Parents: 2923aa5
Author: Dave Brondsema <dbrondsema@geek.net>
Authored: Mon Mar 25 13:56:43 2013 -0700
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Fri May 24 13:22:48 2013 -0400

----------------------------------------------------------------------
 Allura/allura/tests/functional/test_admin.py |    6 +++---
 Allura/allura/websetup/bootstrap.py          |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/76884ad7/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 9741d3c..d11643b 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -44,7 +44,7 @@ def audits(*messages):
         import pdb; pdb.set_trace()
     for message in messages:
         assert M.AuditLog.query.find(dict(
-            message=re.compile(message))).count()
+            message=re.compile(message))).count(), 'Could not find "%s"' % message
 
 class TestProjectAdmin(TestController):
 
@@ -52,10 +52,10 @@ class TestProjectAdmin(TestController):
         self.app.get('/admin/')
         with audits(
             'change summary to Milkshakes are for crazy monkeys',
-            'change project name to Test Project',
+            'change project name to My Test Project',
             u'change short description to (\u00bf A Test Project \?){45}'):
             self.app.post('/admin/update', params=dict(
-                    name='Test Project',
+                    name='My Test Project',
                     shortname='test',
                     summary='Milkshakes are for crazy monkeys',
                     short_description=u'\u00bf A Test Project ?'.encode('utf-8') * 45,

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/76884ad7/Allura/allura/websetup/bootstrap.py
----------------------------------------------------------------------
diff --git a/Allura/allura/websetup/bootstrap.py b/Allura/allura/websetup/bootstrap.py
index 5e8ab1e..f518463 100644
--- a/Allura/allura/websetup/bootstrap.py
+++ b/Allura/allura/websetup/bootstrap.py
@@ -194,12 +194,12 @@ def bootstrap(command, conf, vars):
         p_projects.add_user(u_admin, ['Admin'])
         p_users.add_user(u_admin, ['Admin'])
 
-        p_allura = n_projects.register_project('allura', u_admin)
+        p_allura = n_projects.register_project('allura', u_admin, 'Allura')
     u1 = make_user('Test User')
-    p_adobe1 = n_adobe.register_project('adobe-1', u_admin)
+    p_adobe1 = n_adobe.register_project('adobe-1', u_admin, 'Adobe project 1')
     p_adobe.add_user(u_admin, ['Admin'])
-    p0 = n_projects.register_project('test', u_admin)
-    p1 = n_projects.register_project('test2', u_admin)
+    p0 = n_projects.register_project('test', u_admin, 'Test Project')
+    p1 = n_projects.register_project('test2', u_admin, 'Test 2')
     p0._extra_tool_status = [ 'alpha', 'beta' ]
 
     sess = session(M.Neighborhood) # all the sessions are the same


Mime
View raw message