--- a/Allura/allura/tests/functional/test_home.py
+++ b/Allura/allura/tests/functional/test_home.py
@@ -5,20 +5,25 @@
from allura.tests import TestController
from allura import model as M
+from allura.tests.helpers import validate_page, validate_json
class TestProjectHome(TestController):
def test_project_nav(self):
response = self.app.get('/p/test/_nav.json')
+ validate_json(response)
root = self.app.get('/p/test/home/')
+ validate_page(root)
nav_links = root.html.find('div', dict(id='top_nav')).findAll('a')
assert len(nav_links) == len(response.json['menu'])
for nl, entry in zip(nav_links, response.json['menu']):
assert nl['href'] == entry['url']
def test_home(self):
- r0 = str(self.app.get('/home/'))
+ r0 = self.app.get('/home/').body
+ validate_page(r0)
r = self.app.get('/home/configuration')
+ validate_page(r)
selects = r.html.findAll('select')
options = selects[-1].findAll('option')
wnames = [
@@ -29,14 +34,17 @@
content=[ dict(widget=wn) for wn in wnames ])
]))
self.app.post('/home/update_configuration', params=params)
- r1 = str(self.app.get('/home/'))
+ r1 = self.app.get('/home/').body
+ validate_page(r1)
assert r0 != r1
def test_neighborhood_home(self):
- r0 = str(self.app.get('/p/test/home/'))
+ r0 = self.app.get('/p/test/home/').body
+ validate_page(r0)
r1 = self.app.get('/adobe/test/home/', status=302)
r2 = self.app.get('/adobe/no_such_project/home/', status=404)
r = self.app.get('/p/test/home/configuration')
+ validate_page(r)
selects = r.html.findAll('select')
options = selects[-1].findAll('option')
wnames = [
@@ -47,7 +55,8 @@
content=[ dict(widget=wn) for wn in wnames ])
]))
self.app.post('/p/test/home/update_configuration', params=params)
- r1 = str(self.app.get('/home/'))
+ r1 = self.app.get('/home/').body
+ validate_page(r1)
assert r0 != r1
def test_user_subproject_home_not_profile(self):