From 487f7e763935caf4ff9f2b6518512b9e915fe2c2 Mon Sep 17 00:00:00 2001 From: Christoph Zwerschke Date: Sun, 5 Jun 2011 17:29:52 +0200 Subject: Make tests in the Wiki2 tutorial a separate chapter, as for Wiki1. Also add functional tests to the Wiki2 tutorial, similar to Wiki1. --- docs/tutorials/wiki2/src/views/tutorial/models.py | 1 + docs/tutorials/wiki2/src/views/tutorial/views.py | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'docs/tutorials/wiki2/src/views') diff --git a/docs/tutorials/wiki2/src/views/tutorial/models.py b/docs/tutorials/wiki2/src/views/tutorial/models.py index 11e91232e..960c14941 100644 --- a/docs/tutorials/wiki2/src/views/tutorial/models.py +++ b/docs/tutorials/wiki2/src/views/tutorial/models.py @@ -31,6 +31,7 @@ def initialize_sql(engine): Base.metadata.bind = engine Base.metadata.create_all(engine) try: + transaction.begin() session = DBSession() page = Page('FrontPage', 'initial data') session.add(page) diff --git a/docs/tutorials/wiki2/src/views/tutorial/views.py b/docs/tutorials/wiki2/src/views/tutorial/views.py index b8896abe7..57c1865b5 100644 --- a/docs/tutorials/wiki2/src/views/tutorial/views.py +++ b/docs/tutorials/wiki2/src/views/tutorial/views.py @@ -2,7 +2,7 @@ import re from docutils.core import publish_parts -from pyramid.httpexceptions import HTTPFound +from pyramid.httpexceptions import HTTPFound, HTTPNotFound from pyramid.url import route_url from tutorial.models import DBSession @@ -18,7 +18,9 @@ def view_wiki(request): def view_page(request): matchdict = request.matchdict session = DBSession() - page = session.query(Page).filter_by(name=matchdict['pagename']).one() + page = session.query(Page).filter_by(name=pagename).first() + if page is None: + return HTTPNotFound('No such page') def check(match): word = match.group(1) @@ -48,7 +50,7 @@ def add_page(request): save_url = route_url('add_page', request, pagename=name) page = Page('', '') return dict(page=page, save_url=save_url) - + def edit_page(request): name = request.matchdict['pagename'] session = DBSession() -- cgit v1.2.3