diff options
| author | Michael Merickel <michael@merickel.org> | 2015-10-21 00:34:10 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2015-10-21 00:34:10 -0500 |
| commit | 504027873ab0e1b15601e2d1900ef8a4469f6a43 (patch) | |
| tree | 06e6cbf634a894dbce232c9dbb06324637a95a86 /docs/quick_tutorial/databases/tutorial | |
| parent | bf40a3920278b3e7a01ef5403196b35f45cfcb3c (diff) | |
| parent | e1ec631ab2d470b1550640d21c28ddd1387f4045 (diff) | |
| download | pyramid-504027873ab0e1b15601e2d1900ef8a4469f6a43.tar.gz pyramid-504027873ab0e1b15601e2d1900ef8a4469f6a43.tar.bz2 pyramid-504027873ab0e1b15601e2d1900ef8a4469f6a43.zip | |
Merge pull request #2020 from bertjwregeer/feature/configurable-view-deriver
Configurable View Deriver moving forward...
Diffstat (limited to 'docs/quick_tutorial/databases/tutorial')
| -rw-r--r-- | docs/quick_tutorial/databases/tutorial/tests.py | 6 | ||||
| -rw-r--r-- | docs/quick_tutorial/databases/tutorial/wikipage_addedit.pt | 6 |
2 files changed, 6 insertions, 6 deletions
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..01955ef72 100644 --- a/docs/quick_tutorial/databases/tutorial/wikipage_addedit.pt +++ b/docs/quick_tutorial/databases/tutorial/wikipage_addedit.pt @@ -4,10 +4,12 @@ <title>WikiPage: Add/Edit</title> <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 type="text/javascript" + src="${request.static_url('deform:static/scripts/jquery-2.0.3.min.js')}"></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> |