You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by he...@apache.org on 2015/08/20 18:57:52 UTC
[4/9] allura git commit: [#7923] fixes after rebasing with master
(incl. [#7922] changes)
[#7923] fixes after rebasing with master (incl. [#7922] changes)
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/644a2988
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/644a2988
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/644a2988
Branch: refs/heads/hs/7963
Commit: 644a2988fa140b6865bd9a1ce2e088c40bebf922
Parents: da69a59
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Tue Aug 18 20:04:36 2015 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Aug 18 22:18:00 2015 +0000
----------------------------------------------------------------------
Allura/allura/tests/functional/test_admin.py | 1 +
Allura/allura/tests/test_webhooks.py | 4 +-
.../tests/functional/test_forum.py | 16 ++--
.../tests/functional/test_forum_admin.py | 97 ++++++++++----------
.../tests/functional/test_rest.py | 4 +-
.../forgetracker/tests/functional/test_root.py | 6 +-
.../forgewiki/tests/functional/test_rest.py | 2 +-
7 files changed, 67 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/644a2988/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 28931c0..16590d7 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -324,6 +324,7 @@ class TestProjectAdmin(TestController):
tag for tag in r.html.findAll('input')
if (
tag.get('type') == 'hidden' and
+ tag.get('name') and
tag['name'].startswith('card-') and
tag['name'].endswith('.id'))]
assert len(cards) == len(app.permissions), cards
http://git-wip-us.apache.org/repos/asf/allura/blob/644a2988/Allura/allura/tests/test_webhooks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_webhooks.py b/Allura/allura/tests/test_webhooks.py
index d7fb75c..93da118 100644
--- a/Allura/allura/tests/test_webhooks.py
+++ b/Allura/allura/tests/test_webhooks.py
@@ -261,7 +261,7 @@ class TestWebhookController(TestController):
assert_equal(M.Webhook.query.find().count(), 2)
wh1 = M.Webhook.query.get(hook_url=data1['url'])
r = self.app.get(self.url + '/repo-push/%s' % wh1._id)
- form = r.forms[0]
+ form = r.forms[1]
assert_equal(form['url'].value, data1['url'])
assert_equal(form['secret'].value, data1['secret'])
assert_equal(form['webhook'].value, unicode(wh1._id))
@@ -283,7 +283,7 @@ class TestWebhookController(TestController):
# Duplicates
r = self.app.get(self.url + '/repo-push/%s' % wh1._id)
- form = r.forms[0]
+ form = r.forms[1]
form['url'] = data2['url']
r = form.submit()
self.find_error(r, '_the_form',
http://git-wip-us.apache.org/repos/asf/allura/blob/644a2988/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
index 1efa395..33e1fb9 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
@@ -45,7 +45,7 @@ class TestForumEmail(TestController):
c.user = M.User.by_username('test-admin')
self.app.get('/discussion/')
r = self.app.get('/admin/discussion/forums')
- form = r.forms[2]
+ form = r.forms[3]
form['add_forum.shortname'] = 'testforum'
form['add_forum.name'] = 'Test Forum'
form.submit()
@@ -131,13 +131,13 @@ class TestForumAsync(TestController):
TestController.setUp(self)
self.app.get('/discussion/')
r = self.app.get('/admin/discussion/forums')
- form = r.forms[2]
+ form = r.forms[3]
form['add_forum.shortname'] = 'testforum'
form['add_forum.name'] = 'Test Forum'
form.submit()
r = self.app.get('/admin/discussion/forums')
assert 'Test Forum' in r
- form = r.forms[2]
+ form = r.forms[3]
form['add_forum.shortname'] = 'test1'
form['add_forum.name'] = 'Test Forum 1'
form.submit()
@@ -273,7 +273,7 @@ class TestForum(TestController):
TestController.setUp(self)
self.app.get('/discussion/')
r = self.app.get('/admin/discussion/forums')
- form = r.forms[2]
+ form = r.forms[3]
form['add_forum.shortname'] = 'testforum'
form['add_forum.name'] = 'Test Forum'
form.submit()
@@ -283,7 +283,7 @@ class TestForum(TestController):
h.set_context('test', 'discussion', neighborhood='Projects')
frm = FM.Forum.query.get(shortname='testforum')
r = self.app.get('/admin/discussion/forums')
- form = r.forms[2]
+ form = r.forms[3]
form['add_forum.shortname'] = 'childforum'
form['add_forum.name'] = 'Child Forum'
form['add_forum.parent'] = str(frm._id)
@@ -320,7 +320,7 @@ class TestForum(TestController):
def test_unicode_name(self):
r = self.app.get('/admin/discussion/forums')
- form = r.forms[2]
+ form = r.forms[3]
form['add_forum.shortname'] = u'téstforum'.encode('utf-8')
form['add_forum.name'] = u'Tést Forum'.encode('utf-8')
form.submit()
@@ -329,7 +329,7 @@ class TestForum(TestController):
def test_markdown_description(self):
r = self.app.get('/admin/discussion/forums')
- form = r.forms[2]
+ form = r.forms[3]
form['add_forum.shortname'] = 'tester'
form['add_forum.name'] = 'Tester'
form['add_forum.description'] = '<a href="http://cnn.com">This is CNN</a>'
@@ -829,7 +829,7 @@ class TestForum(TestController):
def test_create_topic_unicode(self):
r = self.app.get('/admin/discussion/forums')
- form = r.forms[2]
+ form = r.forms[3]
form['add_forum.shortname'] = u'téstforum'.encode('utf-8')
form['add_forum.name'] = u'Tést Forum'.encode('utf-8')
form.submit()
http://git-wip-us.apache.org/repos/asf/allura/blob/644a2988/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py b/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py
index 12a401e..4597017 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py
@@ -38,9 +38,9 @@ class TestForumAdmin(TestController):
def test_forum_CRUD(self):
r = self.app.get('/admin/discussion/forums')
- r.forms[2]['add_forum.shortname'] = 'testforum'
- r.forms[2]['add_forum.name'] = 'Test Forum'
- r = r.forms[2].submit().follow()
+ r.forms[3]['add_forum.shortname'] = 'testforum'
+ r.forms[3]['add_forum.name'] = 'Test Forum'
+ r = r.forms[3].submit().follow()
assert 'Test Forum' in r
h.set_context('test', 'Forum', neighborhood='Projects')
frm = FM.Forum.query.get(shortname='testforum')
@@ -57,47 +57,47 @@ class TestForumAdmin(TestController):
def test_forum_CRUD_hier(self):
r = self.app.get('/admin/discussion/forums')
- r.forms[2]['add_forum.shortname'] = 'testforum'
- r.forms[2]['add_forum.name'] = 'Test Forum'
- r = r.forms[2].submit().follow()
+ r.forms[3]['add_forum.shortname'] = 'testforum'
+ r.forms[3]['add_forum.name'] = 'Test Forum'
+ r = r.forms[3].submit().follow()
r = self.app.get('/admin/discussion/forums')
assert 'testforum' in r
h.set_context('test', 'discussion', neighborhood='Projects')
frm = FM.Forum.query.get(shortname='testforum')
r = self.app.get('/admin/discussion/forums')
- r.forms[2]['add_forum.shortname'] = 'childforum'
- r.forms[2]['add_forum.name'] = 'Child Forum'
- r.forms[2]['add_forum.parent'] = str(frm._id)
- r.forms[2].submit()
+ r.forms[3]['add_forum.shortname'] = 'childforum'
+ r.forms[3]['add_forum.name'] = 'Child Forum'
+ r.forms[3]['add_forum.parent'] = str(frm._id)
+ r.forms[3].submit()
r = self.app.get('/admin/discussion/forums')
assert 'Child Forum' in r
def test_bad_forum_names(self):
r = self.app.get('/admin/discussion/forums')
- r.forms[2]['add_forum.shortname'] = 'Test.Forum'
- r.forms[2]['add_forum.name'] = 'Test Forum'
- r = r.forms[2].submit()
+ r.forms[3]['add_forum.shortname'] = 'Test.Forum'
+ r.forms[3]['add_forum.name'] = 'Test Forum'
+ r = r.forms[3].submit()
assert 'error' in r
r = self.app.get('/admin/discussion/forums')
- r.forms[2]['add_forum.shortname'] = 'Test/Forum'
- r.forms[2]['add_forum.name'] = 'Test Forum'
- r = r.forms[2].submit()
+ r.forms[3]['add_forum.shortname'] = 'Test/Forum'
+ r.forms[3]['add_forum.name'] = 'Test Forum'
+ r = r.forms[3].submit()
assert 'error' in r
r = self.app.get('/admin/discussion/forums')
- r.forms[2]['add_forum.shortname'] = 'Test Forum'
- r.forms[2]['add_forum.name'] = 'Test Forum'
- r = r.forms[2].submit()
+ r.forms[3]['add_forum.shortname'] = 'Test Forum'
+ r.forms[3]['add_forum.name'] = 'Test Forum'
+ r = r.forms[3].submit()
assert 'error' in r
def test_duplicate_forum_names(self):
r = self.app.get('/admin/discussion/forums')
- r.forms[2]['add_forum.shortname'] = 'a'
- r.forms[2]['add_forum.name'] = 'Forum A'
- r = r.forms[2].submit()
+ r.forms[3]['add_forum.shortname'] = 'a'
+ r.forms[3]['add_forum.name'] = 'Forum A'
+ r = r.forms[3].submit()
r = self.app.get('/admin/discussion/forums')
- r.forms[2]['add_forum.shortname'] = 'b'
- r.forms[2]['add_forum.name'] = 'Forum B'
- r = r.forms[2].submit()
+ r.forms[3]['add_forum.shortname'] = 'b'
+ r.forms[3]['add_forum.name'] = 'Forum B'
+ r = r.forms[3].submit()
h.set_context('test', 'Forum', neighborhood='Projects')
forum_a = FM.Forum.query.get(shortname='a')
self.app.post('/admin/discussion/update_forums',
@@ -109,14 +109,14 @@ class TestForumAdmin(TestController):
# Now we have two forums: 'a', and 'b'. 'a' is deleted.
# Let's try to create new forums with these names.
r = self.app.get('/admin/discussion/forums')
- r.forms[2]['add_forum.shortname'] = 'a'
- r.forms[2]['add_forum.name'] = 'Forum A'
- r = r.forms[2].submit()
+ r.forms[3]['add_forum.shortname'] = 'a'
+ r.forms[3]['add_forum.name'] = 'Forum A'
+ r = r.forms[3].submit()
assert 'error' in r
r = self.app.get('/admin/discussion/forums')
- r.forms[2]['add_forum.shortname'] = 'b'
- r.forms[2]['add_forum.name'] = 'Forum B'
- r = r.forms[2].submit()
+ r.forms[3]['add_forum.shortname'] = 'b'
+ r.forms[3]['add_forum.name'] = 'Forum B'
+ r = r.forms[3].submit()
assert 'error' in r
def test_forum_icon(self):
@@ -128,7 +128,7 @@ class TestForumAdmin(TestController):
h.set_context('test', 'discussion', neighborhood='Projects')
r = self.app.get('/admin/discussion/forums')
- app_id = r.forms[2]['add_forum.app_id'].value
+ app_id = r.forms[3]['add_forum.app_id'].value
r = self.app.post('/admin/discussion/add_forum',
params={'add_forum.shortname': 'testforum',
'add_forum.app_id': app_id,
@@ -144,11 +144,12 @@ class TestForumAdmin(TestController):
def test_delete_undelete(self):
r = self.app.get('/admin/discussion/forums')
r = self.app.get('/admin/discussion/forums')
- r.forms[2]['add_forum.shortname'] = 'testforum'
- r.forms[2]['add_forum.name'] = 'Test Forum'
- r = r.forms[2].submit()
+ r.forms[3]['add_forum.shortname'] = 'testforum'
+ r.forms[3]['add_forum.name'] = 'Test Forum'
+ r = r.forms[3].submit()
r = self.app.get('/admin/discussion/forums')
- assert len(r.html.findAll('input', {'value': 'Delete'})) == 2
+ soup_form = r.html.find('form', action='update_forums')
+ assert len(soup_form.findAll('input', {'value': 'Delete'})) == 2
h.set_context('test', 'Forum', neighborhood='Projects')
frm = FM.Forum.query.get(shortname='testforum')
@@ -158,21 +159,23 @@ class TestForumAdmin(TestController):
'forum-0.name': 'New Test Forum',
'forum-0.description': 'My desc'})
r = self.app.get('/admin/discussion/forums')
- assert len(r.html.findAll('input', {'value': 'Delete'})) == 1
+ soup_form = r.html.find('form', action='update_forums')
+ assert len(soup_form.findAll('input', {'value': 'Delete'})) == 1
r = self.app.post('/admin/discussion/update_forums',
params={'forum-0.undelete': 'on',
'forum-0.id': str(frm._id),
'forum-0.name': 'New Test Forum',
'forum-0.description': 'My desc'})
r = self.app.get('/admin/discussion/forums')
- assert len(r.html.findAll('input', {'value': 'Delete'})) == 2
+ soup_form = r.html.find('form', action='update_forums')
+ assert len(soup_form.findAll('input', {'value': 'Delete'})) == 2
def test_members_only(self):
# make a forum anyone can see
r = self.app.get('/admin/discussion/forums')
- r.forms[2]['add_forum.shortname'] = 'secret'
- r.forms[2]['add_forum.name'] = 'Secret'
- r.forms[2].submit()
+ r.forms[3]['add_forum.shortname'] = 'secret'
+ r.forms[3]['add_forum.name'] = 'Secret'
+ r.forms[3].submit()
# forum can be viewed by member and non-member
self.app.get('/discussion/secret')
self.app.get('/discussion/secret',
@@ -230,9 +233,9 @@ class TestForumAdmin(TestController):
def test_anon_posts(self):
# make a forum anons can't post in
r = self.app.get('/admin/discussion/forums')
- r.forms[2]['add_forum.shortname'] = 'testforum'
- r.forms[2]['add_forum.name'] = 'Test Forum'
- r.forms[2].submit()
+ r.forms[3]['add_forum.shortname'] = 'testforum'
+ r.forms[3]['add_forum.name'] = 'Test Forum'
+ r.forms[3].submit()
# try to post in the forum and get a 403
r = self.app.get('/discussion/create_topic/')
f = r.html.find(
@@ -277,9 +280,9 @@ class TestForumAdmin(TestController):
def test_footer_monitoring_email(self):
r = self.app.get('/admin/discussion/forums')
- r.forms[2]['add_forum.shortname'] = 'testforum'
- r.forms[2]['add_forum.name'] = 'Test Forum'
- r.forms[2].submit()
+ r.forms[3]['add_forum.shortname'] = 'testforum'
+ r.forms[3]['add_forum.name'] = 'Test Forum'
+ r.forms[3].submit()
testforum = FM.Forum.query.get(shortname='testforum')
self.app.post('/admin/discussion/update_forums',
params={'forum-0.anon_posts': 'on',
http://git-wip-us.apache.org/repos/asf/allura/blob/644a2988/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py b/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
index c8b69f2..c7624a4 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
@@ -42,7 +42,7 @@ class TestDiscussionApiBase(TestRestApiBase):
def create_forum(self, shortname, name, description):
r = self.app.get('/admin/discussion/forums')
- form = r.forms[2]
+ form = r.forms[3]
form['add_forum.shortname'] = 'héllo'
form['add_forum.name'] = 'Say Héllo'
form['add_forum.description'] = 'Say héllo here'
@@ -236,7 +236,7 @@ class TestRootRestController(TestDiscussionApiBase):
def test_private_forums(self):
r = self.app.get('/p/test/admin/discussion/forums')
- form = r.forms[1]
+ form = r.forms[2]
if form['forum-0.shortname'].value == u'héllo':
form['forum-0.members_only'] = True
else:
http://git-wip-us.apache.org/repos/asf/allura/blob/644a2988/ForgeTracker/forgetracker/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index 5f1339b..efcc59d 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -1408,7 +1408,7 @@ class TestFunctionalController(TrackerTestController):
'sort': ''})
assert err in r
r = self.app.get('/admin/bugs/bins/')
- edit_form = r.forms[1]
+ edit_form = r.forms[2]
edit_form['bins-2.summary'] = 'Original'
edit_form['bins-2.terms'] = 'label:foo'
r = edit_form.submit()
@@ -1432,7 +1432,7 @@ class TestFunctionalController(TrackerTestController):
def test_edit_saved_search(self):
r = self.app.get('/admin/bugs/bins/')
- edit_form = r.forms[1]
+ edit_form = r.forms[2]
edit_form['bins-2.summary'] = 'Original'
edit_form['bins-2.terms'] = 'aaa'
edit_form.submit()
@@ -1440,7 +1440,7 @@ class TestFunctionalController(TrackerTestController):
assert sidebar_contains(r, 'Original')
assert not sidebar_contains(r, 'New')
r = self.app.get('/admin/bugs/bins/')
- edit_form = r.forms[1]
+ edit_form = r.forms[2]
edit_form['bins-2.summary'] = 'New'
edit_form.submit()
r = self.app.get('/bugs/')
http://git-wip-us.apache.org/repos/asf/allura/blob/644a2988/ForgeWiki/forgewiki/tests/functional/test_rest.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/tests/functional/test_rest.py b/ForgeWiki/forgewiki/tests/functional/test_rest.py
index 9069705..3bc61bb 100644
--- a/ForgeWiki/forgewiki/tests/functional/test_rest.py
+++ b/ForgeWiki/forgewiki/tests/functional/test_rest.py
@@ -42,7 +42,7 @@ class TestWikiApi(TestRestApiBase):
def test_get_page(self):
r = self.app.get('/p/test/wiki/Home/')
- discussion_url = r.html.findAll('form')[4]['action'][:-4]
+ discussion_url = r.html.findAll('form')[5]['action'][:-4]
content = file(__file__).read()
self.app.post('/wiki/Home/attach',
upload_files=[('file_info', 'test_root.py', content)])