diff options
Diffstat (limited to 'docs/tutorials/wiki2/src')
| -rw-r--r-- | docs/tutorials/wiki2/src/tests/tests/conftest.py | 1 | ||||
| -rw-r--r-- | docs/tutorials/wiki2/src/tests/tests/test_views.py | 22 |
2 files changed, 22 insertions, 1 deletions
diff --git a/docs/tutorials/wiki2/src/tests/tests/conftest.py b/docs/tutorials/wiki2/src/tests/tests/conftest.py index 0fe689697..8882ea265 100644 --- a/docs/tutorials/wiki2/src/tests/tests/conftest.py +++ b/docs/tutorials/wiki2/src/tests/tests/conftest.py @@ -169,5 +169,4 @@ def dummy_request(tm, dbsession): @pytest.yield_fixture def dummy_config(dummy_request): with testConfig(request=dummy_request) as config: - config.include('tutorial.routes') # Current workaround, feels wrong. yield config diff --git a/docs/tutorials/wiki2/src/tests/tests/test_views.py b/docs/tutorials/wiki2/src/tests/tests/test_views.py index 4e64dae1f..e93b04b3c 100644 --- a/docs/tutorials/wiki2/src/tests/tests/test_views.py +++ b/docs/tutorials/wiki2/src/tests/tests/test_views.py @@ -20,7 +20,11 @@ class Test_view_wiki: from tutorial.views.default import view_wiki return view_wiki(request) + def _addRoutes(self, config): + config.add_route('view_page', '/{pagename}') + def test_it(self, dummy_config, dummy_request): + self._addRoutes(dummy_config) response = self._callFUT(dummy_request) assert response.location == 'http://example.com/FrontPage' @@ -33,6 +37,11 @@ class Test_view_page: from tutorial.routes import PageResource return PageResource(page) + def _addRoutes(self, config): + config.add_route('edit_page', '/{pagename}/edit_page') + config.add_route('add_page', '/add_page/{pagename}') + config.add_route('view_page', '/{pagename}') + def test_it(self, dummy_config, dummy_request, dbsession): # add a page to the db user = makeUser('foo', 'editor') @@ -40,6 +49,7 @@ class Test_view_page: dbsession.add_all([page, user]) # create a request asking for the page we've created + self._addRoutes(dummy_config) dummy_request.context = self._makeContext(page) # call the view we're testing and check its behavior @@ -64,8 +74,13 @@ class Test_add_page: from tutorial.routes import NewPage return NewPage(pagename) + def _addRoutes(self, config): + config.add_route('add_page', '/add_page/{pagename}') + config.add_route('view_page', '/{pagename}') + def test_get(self, dummy_config, dummy_request, dbsession): setUser(dummy_config, makeUser('foo', 'editor')) + self._addRoutes(dummy_config) dummy_request.context = self._makeContext('AnotherPage') info = self._callFUT(dummy_request) assert info['pagedata'] == '' @@ -76,6 +91,7 @@ class Test_add_page: dummy_request.POST['body'] = 'Hello yo!' dummy_request.context = self._makeContext('AnotherPage') setUser(dummy_config, makeUser('foo', 'editor')) + self._addRoutes(dummy_config) self._callFUT(dummy_request) page = ( dbsession.query(models.Page) @@ -93,11 +109,16 @@ class Test_edit_page: from tutorial.routes import PageResource return PageResource(page) + def _addRoutes(self, config): + config.add_route('edit_page', '/{pagename}/edit_page') + config.add_route('view_page', '/{pagename}') + def test_get(self, dummy_config, dummy_request, dbsession): user = makeUser('foo', 'editor') page = makePage('abc', 'hello', user) dbsession.add_all([page, user]) + self._addRoutes(dummy_config) dummy_request.context = self._makeContext(page) info = self._callFUT(dummy_request) assert info['pagename'] == 'abc' @@ -108,6 +129,7 @@ class Test_edit_page: page = makePage('abc', 'hello', user) dbsession.add_all([page, user]) + self._addRoutes(dummy_config) dummy_request.method = 'POST' dummy_request.POST['body'] = 'Hello yo!' setUser(dummy_config, user) |