You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/08/14 13:37:11 UTC
[4/4] allura git commit: [#7923] ticket:827 Fix tests
[#7923] ticket:827 Fix tests
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/7b021fcb
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/7b021fcb
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/7b021fcb
Branch: refs/heads/ib/7923
Commit: 7b021fcb1d57f3f2ee560b0cfe3105db5cb700c4
Parents: 895cdfc
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Aug 14 14:10:06 2015 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Fri Aug 14 14:10:06 2015 +0300
----------------------------------------------------------------------
.../tests/functional/test_forum.py | 61 ++++++++------
.../tests/functional/test_forum_admin.py | 88 ++++++++++----------
.../tests/functional/test_rest.py | 11 +--
.../forgetracker/tests/functional/test_root.py | 6 +-
.../forgewiki/tests/functional/test_rest.py | 2 +-
.../forgewiki/tests/functional/test_root.py | 5 +-
6 files changed, 91 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/7b021fcb/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 23ec71f..1efa395 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
@@ -45,9 +45,10 @@ class TestForumEmail(TestController):
c.user = M.User.by_username('test-admin')
self.app.get('/discussion/')
r = self.app.get('/admin/discussion/forums')
- r.forms[1]['add_forum.shortname'] = 'testforum'
- r.forms[1]['add_forum.name'] = 'Test Forum'
- r.forms[1].submit()
+ form = r.forms[2]
+ form['add_forum.shortname'] = 'testforum'
+ form['add_forum.name'] = 'Test Forum'
+ form.submit()
r = self.app.get('/admin/discussion/forums')
assert 'testforum' in r
self.email_address = c.user.email_addresses[0]
@@ -130,14 +131,16 @@ class TestForumAsync(TestController):
TestController.setUp(self)
self.app.get('/discussion/')
r = self.app.get('/admin/discussion/forums')
- r.forms[1]['add_forum.shortname'] = 'testforum'
- r.forms[1]['add_forum.name'] = 'Test Forum'
- r.forms[1].submit()
+ form = r.forms[2]
+ 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
- r.forms[1]['add_forum.shortname'] = 'test1'
- r.forms[1]['add_forum.name'] = 'Test Forum 1'
- r.forms[1].submit()
+ form = r.forms[2]
+ form['add_forum.shortname'] = 'test1'
+ form['add_forum.name'] = 'Test Forum 1'
+ form.submit()
r = self.app.get('/admin/discussion/forums')
assert 'Test Forum 1' in r
h.set_context('test', 'discussion', neighborhood='Projects')
@@ -270,19 +273,21 @@ class TestForum(TestController):
TestController.setUp(self)
self.app.get('/discussion/')
r = self.app.get('/admin/discussion/forums')
- r.forms[1]['add_forum.shortname'] = 'testforum'
- r.forms[1]['add_forum.name'] = 'Test Forum'
- r.forms[1].submit()
+ form = r.forms[2]
+ form['add_forum.shortname'] = 'testforum'
+ form['add_forum.name'] = 'Test Forum'
+ form.submit()
r = self.app.get('/admin/discussion/forums')
frm = FM.Forum.query.get(shortname='testforum')
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[1]['add_forum.shortname'] = 'childforum'
- r.forms[1]['add_forum.name'] = 'Child Forum'
- r.forms[1]['add_forum.parent'] = str(frm._id)
- r.forms[1].submit()
+ form = r.forms[2]
+ form['add_forum.shortname'] = 'childforum'
+ form['add_forum.name'] = 'Child Forum'
+ form['add_forum.parent'] = str(frm._id)
+ form.submit()
r = self.app.get('/admin/discussion/forums')
assert 'childforum' in r
@@ -315,19 +320,20 @@ class TestForum(TestController):
def test_unicode_name(self):
r = self.app.get('/admin/discussion/forums')
- r.forms[1]['add_forum.shortname'] = u'téstforum'.encode('utf-8')
- r.forms[1]['add_forum.name'] = u'Tést Forum'.encode('utf-8')
- r.forms[1].submit()
+ form = r.forms[2]
+ form['add_forum.shortname'] = u'téstforum'.encode('utf-8')
+ form['add_forum.name'] = u'Tést Forum'.encode('utf-8')
+ form.submit()
r = self.app.get('/admin/discussion/forums')
assert u'téstforum'.encode('utf-8') in r
def test_markdown_description(self):
r = self.app.get('/admin/discussion/forums')
- r.forms[1]['add_forum.shortname'] = 'tester'
- r.forms[1]['add_forum.name'] = 'Tester'
- r.forms[1][
- 'add_forum.description'] = '<a href="http://cnn.com">This is CNN</a>'
- r.forms[1].submit()
+ form = r.forms[2]
+ form['add_forum.shortname'] = 'tester'
+ form['add_forum.name'] = 'Tester'
+ form['add_forum.description'] = '<a href="http://cnn.com">This is CNN</a>'
+ form.submit()
r = self.app.get('/discussion/')
assert_equal(len(r.html.findAll('a', rel='nofollow')), 1)
@@ -823,9 +829,10 @@ class TestForum(TestController):
def test_create_topic_unicode(self):
r = self.app.get('/admin/discussion/forums')
- r.forms[1]['add_forum.shortname'] = u'téstforum'.encode('utf-8')
- r.forms[1]['add_forum.name'] = u'Tést Forum'.encode('utf-8')
- r.forms[1].submit()
+ form = r.forms[2]
+ form['add_forum.shortname'] = u'téstforum'.encode('utf-8')
+ form['add_forum.name'] = u'Tést Forum'.encode('utf-8')
+ form.submit()
r = self.app.get('/admin/discussion/forums')
assert u'téstforum'.encode('utf-8') in r
r = self.app.get(u'/p/test/discussion/create_topic/téstforum/'.encode('utf-8'))
http://git-wip-us.apache.org/repos/asf/allura/blob/7b021fcb/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 0eb4168..12a401e 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[1]['add_forum.shortname'] = 'testforum'
- r.forms[1]['add_forum.name'] = 'Test Forum'
- r = r.forms[1].submit().follow()
+ r.forms[2]['add_forum.shortname'] = 'testforum'
+ r.forms[2]['add_forum.name'] = 'Test Forum'
+ r = r.forms[2].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[1]['add_forum.shortname'] = 'testforum'
- r.forms[1]['add_forum.name'] = 'Test Forum'
- r = r.forms[1].submit().follow()
+ r.forms[2]['add_forum.shortname'] = 'testforum'
+ r.forms[2]['add_forum.name'] = 'Test Forum'
+ r = r.forms[2].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[1]['add_forum.shortname'] = 'childforum'
- r.forms[1]['add_forum.name'] = 'Child Forum'
- r.forms[1]['add_forum.parent'] = str(frm._id)
- r.forms[1].submit()
+ 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 = 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[1]['add_forum.shortname'] = 'Test.Forum'
- r.forms[1]['add_forum.name'] = 'Test Forum'
- r = r.forms[1].submit()
+ r.forms[2]['add_forum.shortname'] = 'Test.Forum'
+ r.forms[2]['add_forum.name'] = 'Test Forum'
+ r = r.forms[2].submit()
assert 'error' in r
r = self.app.get('/admin/discussion/forums')
- r.forms[1]['add_forum.shortname'] = 'Test/Forum'
- r.forms[1]['add_forum.name'] = 'Test Forum'
- r = r.forms[1].submit()
+ r.forms[2]['add_forum.shortname'] = 'Test/Forum'
+ r.forms[2]['add_forum.name'] = 'Test Forum'
+ r = r.forms[2].submit()
assert 'error' in r
r = self.app.get('/admin/discussion/forums')
- r.forms[1]['add_forum.shortname'] = 'Test Forum'
- r.forms[1]['add_forum.name'] = 'Test Forum'
- r = r.forms[1].submit()
+ r.forms[2]['add_forum.shortname'] = 'Test Forum'
+ r.forms[2]['add_forum.name'] = 'Test Forum'
+ r = r.forms[2].submit()
assert 'error' in r
def test_duplicate_forum_names(self):
r = self.app.get('/admin/discussion/forums')
- r.forms[1]['add_forum.shortname'] = 'a'
- r.forms[1]['add_forum.name'] = 'Forum A'
- r = r.forms[1].submit()
+ r.forms[2]['add_forum.shortname'] = 'a'
+ r.forms[2]['add_forum.name'] = 'Forum A'
+ r = r.forms[2].submit()
r = self.app.get('/admin/discussion/forums')
- r.forms[1]['add_forum.shortname'] = 'b'
- r.forms[1]['add_forum.name'] = 'Forum B'
- r = r.forms[1].submit()
+ r.forms[2]['add_forum.shortname'] = 'b'
+ r.forms[2]['add_forum.name'] = 'Forum B'
+ r = r.forms[2].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[1]['add_forum.shortname'] = 'a'
- r.forms[1]['add_forum.name'] = 'Forum A'
- r = r.forms[1].submit()
+ r.forms[2]['add_forum.shortname'] = 'a'
+ r.forms[2]['add_forum.name'] = 'Forum A'
+ r = r.forms[2].submit()
assert 'error' in r
r = self.app.get('/admin/discussion/forums')
- r.forms[1]['add_forum.shortname'] = 'b'
- r.forms[1]['add_forum.name'] = 'Forum B'
- r = r.forms[1].submit()
+ r.forms[2]['add_forum.shortname'] = 'b'
+ r.forms[2]['add_forum.name'] = 'Forum B'
+ r = r.forms[2].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[1]['add_forum.app_id'].value
+ app_id = r.forms[2]['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,9 +144,9 @@ class TestForumAdmin(TestController):
def test_delete_undelete(self):
r = self.app.get('/admin/discussion/forums')
r = self.app.get('/admin/discussion/forums')
- r.forms[1]['add_forum.shortname'] = 'testforum'
- r.forms[1]['add_forum.name'] = 'Test Forum'
- r = r.forms[1].submit()
+ r.forms[2]['add_forum.shortname'] = 'testforum'
+ r.forms[2]['add_forum.name'] = 'Test Forum'
+ r = r.forms[2].submit()
r = self.app.get('/admin/discussion/forums')
assert len(r.html.findAll('input', {'value': 'Delete'})) == 2
h.set_context('test', 'Forum', neighborhood='Projects')
@@ -170,9 +170,9 @@ class TestForumAdmin(TestController):
def test_members_only(self):
# make a forum anyone can see
r = self.app.get('/admin/discussion/forums')
- r.forms[1]['add_forum.shortname'] = 'secret'
- r.forms[1]['add_forum.name'] = 'Secret'
- r.forms[1].submit()
+ r.forms[2]['add_forum.shortname'] = 'secret'
+ r.forms[2]['add_forum.name'] = 'Secret'
+ r.forms[2].submit()
# forum can be viewed by member and non-member
self.app.get('/discussion/secret')
self.app.get('/discussion/secret',
@@ -230,9 +230,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[1]['add_forum.shortname'] = 'testforum'
- r.forms[1]['add_forum.name'] = 'Test Forum'
- r.forms[1].submit()
+ r.forms[2]['add_forum.shortname'] = 'testforum'
+ r.forms[2]['add_forum.name'] = 'Test Forum'
+ r.forms[2].submit()
# try to post in the forum and get a 403
r = self.app.get('/discussion/create_topic/')
f = r.html.find(
@@ -277,9 +277,9 @@ class TestForumAdmin(TestController):
def test_footer_monitoring_email(self):
r = self.app.get('/admin/discussion/forums')
- r.forms[1]['add_forum.shortname'] = 'testforum'
- r.forms[1]['add_forum.name'] = 'Test Forum'
- r.forms[1].submit()
+ r.forms[2]['add_forum.shortname'] = 'testforum'
+ r.forms[2]['add_forum.name'] = 'Test Forum'
+ r.forms[2].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/7b021fcb/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 1f64eb5..c8b69f2 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_rest.py
@@ -42,10 +42,11 @@ class TestDiscussionApiBase(TestRestApiBase):
def create_forum(self, shortname, name, description):
r = self.app.get('/admin/discussion/forums')
- r.forms[1]['add_forum.shortname'] = 'héllo'
- r.forms[1]['add_forum.name'] = 'Say Héllo'
- r.forms[1]['add_forum.description'] = 'Say héllo here'
- r.forms[1].submit()
+ form = r.forms[2]
+ form['add_forum.shortname'] = 'héllo'
+ form['add_forum.name'] = 'Say Héllo'
+ form['add_forum.description'] = 'Say héllo here'
+ form.submit()
def create_topic(self, forum, subject, text):
r = self.app.get('/discussion/create_topic/')
@@ -235,7 +236,7 @@ class TestRootRestController(TestDiscussionApiBase):
def test_private_forums(self):
r = self.app.get('/p/test/admin/discussion/forums')
- form = r.forms[0]
+ form = r.forms[1]
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/7b021fcb/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 47c9aab..2a754bb 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -1397,7 +1397,7 @@ class TestFunctionalController(TrackerTestController):
'sort': ''})
assert err in r
r = self.app.get('/admin/bugs/bins/')
- edit_form = r.form
+ edit_form = r.forms[1]
edit_form['bins-2.summary'] = 'Original'
edit_form['bins-2.terms'] = 'label:foo'
r = edit_form.submit()
@@ -1421,7 +1421,7 @@ class TestFunctionalController(TrackerTestController):
def test_edit_saved_search(self):
r = self.app.get('/admin/bugs/bins/')
- edit_form = r.form
+ edit_form = r.forms[1]
edit_form['bins-2.summary'] = 'Original'
edit_form['bins-2.terms'] = 'aaa'
edit_form.submit()
@@ -1429,7 +1429,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.form
+ edit_form = r.forms[1]
edit_form['bins-2.summary'] = 'New'
edit_form.submit()
r = self.app.get('/bugs/')
http://git-wip-us.apache.org/repos/asf/allura/blob/7b021fcb/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 6a5de3b..9069705 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')[2]['action'][:-4]
+ discussion_url = r.html.findAll('form')[4]['action'][:-4]
content = file(__file__).read()
self.app.post('/wiki/Home/attach',
upload_files=[('file_info', 'test_root.py', content)])
http://git-wip-us.apache.org/repos/asf/allura/blob/7b021fcb/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 3f69d89..78dbc45 100644
--- a/ForgeWiki/forgewiki/tests/functional/test_root.py
+++ b/ForgeWiki/forgewiki/tests/functional/test_root.py
@@ -678,8 +678,9 @@ class TestRootController(TestController):
assert 'The resource was found at http://localhost/p/test/wiki/Home/;' in self.app.get(
'/p/test/wiki/')
req = self.app.get('/p/test/wiki/Home/edit')
- req.forms[1]['title'].value = 'new_title'
- req.forms[1].submit()
+ form = req.forms[3]
+ form['title'].value = 'new_title'
+ form.submit()
assert 'The resource was found at http://localhost/p/test/wiki/new_title/;' in self.app.get(
'/p/test/wiki/')