allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [1/2] allura git commit: [#8037] ticket:881 fix tests, change docsting
Date Mon, 11 Jan 2016 18:38:25 GMT
Repository: allura
Updated Branches:
  refs/heads/master 71c5e82b2 -> 3e9fb1d8b


[#8037] ticket:881 fix tests, change docsting


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

Branch: refs/heads/master
Commit: 3e9fb1d8b3a775002d71a5b4d409f022949800a5
Parents: 5495758
Author: Denis Kotov <deniskkotov@gmail.com>
Authored: Fri Dec 25 19:18:35 2015 +0200
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Mon Jan 11 13:19:33 2016 -0500

----------------------------------------------------------------------
 Allura/allura/app.py                              | 2 +-
 ForgeWiki/forgewiki/tests/functional/test_root.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/3e9fb1d8/Allura/allura/app.py
----------------------------------------------------------------------
diff --git a/Allura/allura/app.py b/Allura/allura/app.py
index 7dc7f1f..bd69174 100644
--- a/Allura/allura/app.py
+++ b/Allura/allura/app.py
@@ -611,7 +611,7 @@ class Application(object):
                 project in which this Application is installed
             - 'Options', if this Application has custom options, or
                 ``force_options`` is True
-            - 'Label', for editing this Application's label
+            - 'Rename', for editing this Application's label
             - 'Webhooks', if this Application can trigger any webhooks
 
         Subclasses should override this method to provide additional admin

http://git-wip-us.apache.org/repos/asf/allura/blob/3e9fb1d8/ForgeWiki/forgewiki/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/tests/functional/test_root.py b/ForgeWiki/forgewiki/tests/functional/test_root.py
index ffda744..95d590d 100644
--- a/ForgeWiki/forgewiki/tests/functional/test_root.py
+++ b/ForgeWiki/forgewiki/tests/functional/test_root.py
@@ -830,7 +830,7 @@ class TestRootController(TestController):
         menu = [li.find('span').getText() for li in menu.findAll('li')]
         assert_equal(
             menu,
-            ['Set Home', 'Permissions', 'Options', 'Label', 'Delete'])
+            ['Set Home', 'Permissions', 'Options', 'Rename', 'Delete'])
 
     def test_sidebar_admin_menu_is_expanded(self):
         r = self.app.get('/p/test/admin/wiki/permissions')


Mime
View raw message