5 files changed, 53 insertions, 27 deletions
diff --git a/docs/quick_tutorial/databases/development.ini b/docs/quick_tutorial/databases/development.ini
index 270da960f..270cf7b63 100644
--- a/docs/quick_tutorial/databases/development.ini
+++ b/docs/quick_tutorial/databases/development.ini
@@ -8,25 +8,19 @@ pyramid.includes =
 sqlalchemy.url = sqlite:///%(here)s/sqltutorial.sqlite
 
 [server:main]
-use = egg:pyramid#wsgiref
-host = 0.0.0.0
-port = 6543
+use = egg:waitress#main
+listen = localhost:6543
 
 # Begin logging configuration
 
 [loggers]
-keys = root, tutorial, sqlalchemy
+keys = root, tutorial, sqlalchemy.engine.base.Engine
 
 [logger_tutorial]
 level = DEBUG
 handlers =
 qualname = tutorial
 
-[logger_sqlalchemy]
-level = INFO
-handlers =
-qualname = sqlalchemy.engine
-
 [handlers]
 keys = console
 
@@ -37,6 +31,11 @@ keys = generic
 level = INFO
 handlers = console
 
+[logger_sqlalchemy.engine.base.Engine]
+level = INFO
+handlers =
+qualname = sqlalchemy.engine.base.Engine
+
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
diff --git a/docs/quick_tutorial/databases/setup.py b/docs/quick_tutorial/databases/setup.py
index 238358fe4..c4e4ae2f2 100644
--- a/docs/quick_tutorial/databases/setup.py
+++ b/docs/quick_tutorial/databases/setup.py
@@ -1,20 +1,38 @@
 from setuptools import setup
 
+# List of dependencies installed via `pip install -e .`
+# by virtue of the Setuptools `install_requires` value below.
 requires = [
+    'deform',
     'pyramid',
     'pyramid_chameleon',
-    'deform',
-    'sqlalchemy',
     'pyramid_tm',
-    'zope.sqlalchemy'
+    'sqlalchemy',
+    'waitress',
+    'zope.sqlalchemy',
+]
+
+# List of dependencies installed via `pip install -e ".[dev]"`
+# by virtue of the Setuptools `extras_require` value in the Python
+# dictionary below.
+dev_requires = [
+    'pyramid_debugtoolbar',
+    'pytest',
+    'webtest',
 ]
 
-setup(name='tutorial',
-      install_requires=requires,
-      entry_points="""\
-      [paste.app_factory]
-      main = tutorial:main
-      [console_scripts]
-      initialize_tutorial_db = tutorial.initialize_db:main
-      """,
-)
-\ No newline at end of file
+setup(
+    name='tutorial',
+    install_requires=requires,
+    extras_require={
+        'dev': dev_requires,
+    },
+    entry_points={
+        'paste.app_factory': [
+            'main = tutorial:main'
+        ],
+        'console_scripts': [
+            'initialize_tutorial_db = tutorial.initialize_db:main'
+        ],
+    },
+)
diff --git a/docs/quick_tutorial/databases/sqltutorial.sqlite b/docs/quick_tutorial/databases/sqltutorial.sqlite
deleted file mode 100644
index b8bd856fd..000000000
--- a/docs/quick_tutorial/databases/sqltutorial.sqlite
+++ /dev/null
diff --git a/docs/quick_tutorial/databases/tutorial/tests.py b/docs/quick_tutorial/databases/tutorial/tests.py
index e18e70c8c..11e747d15 100644
--- a/docs/quick_tutorial/databases/tutorial/tests.py
+++ b/docs/quick_tutorial/databases/tutorial/tests.py
@@ -40,16 +40,14 @@ class WikiViewTests(unittest.TestCase):
 
 class WikiFunctionalTests(unittest.TestCase):
     def setUp(self):
-        self.session = _initTestingDB()
-        self.config = testing.setUp()
         from pyramid.paster import get_app
         app = get_app('development.ini')
         from webtest import TestApp
         self.testapp = TestApp(app)
 
     def tearDown(self):
-        self.session.remove()
-        testing.tearDown()
+        from .models import DBSession
+        DBSession.remove()
 
     def test_it(self):
         res = self.testapp.get('/', status=200)
diff --git a/docs/quick_tutorial/databases/tutorial/wikipage_addedit.pt b/docs/quick_tutorial/databases/tutorial/wikipage_addedit.pt
index d1fea0d7f..25bab04d0 100644
--- a/docs/quick_tutorial/databases/tutorial/wikipage_addedit.pt
+++ b/docs/quick_tutorial/databases/tutorial/wikipage_addedit.pt
@@ -2,12 +2,23 @@
 <html lang="en">
 <head>
     <title>WikiPage: Add/Edit</title>
+    <link rel="stylesheet"
+          href="${request.static_url('deform:static/css/bootstrap.min.css')}"
+          type="text/css" media="screen" charset="utf-8"/>
+    <link rel="stylesheet"
+          href="${request.static_url('deform:static/css/form.css')}"
+          type="text/css"/>
     <tal:block tal:repeat="reqt view.reqts['css']">
         <link rel="stylesheet" type="text/css"
-              href="${request.static_url('deform:static/' + reqt)}"/>
+              href="${request.static_url(reqt)}"/>
     </tal:block>
+    <script src="${request.static_url('deform:static/scripts/jquery-2.0.3.min.js')}"
+            type="text/javascript"></script>
+    <script src="${request.static_url('deform:static/scripts/bootstrap.min.js')}"
+            type="text/javascript"></script>
+
     <tal:block tal:repeat="reqt view.reqts['js']">
-        <script src="${request.static_url('deform:static/' + reqt)}"
+        <script src="${request.static_url(reqt)}"
                 type="text/javascript"></script>
     </tal:block>
 </head>