From 3c484c3333672a7ed60436e14cd731458f7bd5e6 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Sun, 12 Jan 2020 15:46:10 -0600
Subject: re-sync changes to starter conftest

---
 docs/tutorials/wiki/src/basiclayout/.gitignore      |  2 +-
 .../wiki/src/basiclayout/tests/conftest.py          | 21 ++++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

(limited to 'docs/tutorials/wiki/src/basiclayout')

diff --git a/docs/tutorials/wiki/src/basiclayout/.gitignore b/docs/tutorials/wiki/src/basiclayout/.gitignore
index c612e59f2..e9336274d 100644
--- a/docs/tutorials/wiki/src/basiclayout/.gitignore
+++ b/docs/tutorials/wiki/src/basiclayout/.gitignore
@@ -11,7 +11,7 @@ dist/
 nosetests.xml
 env*/
 tmp/
-Data.fs*
+Data*.fs*
 *.sublime-project
 *.sublime-workspace
 .*.sw?
diff --git a/docs/tutorials/wiki/src/basiclayout/tests/conftest.py b/docs/tutorials/wiki/src/basiclayout/tests/conftest.py
index 12e75d8e9..6a702ae12 100644
--- a/docs/tutorials/wiki/src/basiclayout/tests/conftest.py
+++ b/docs/tutorials/wiki/src/basiclayout/tests/conftest.py
@@ -3,6 +3,7 @@ from pyramid.paster import get_appsettings
 from pyramid.scripting import prepare
 from pyramid.testing import DummyRequest
 import pytest
+import transaction
 import webtest
 
 from tutorial import main
@@ -25,15 +26,27 @@ def app(app_settings):
     return main({}, **app_settings)
 
 @pytest.fixture
-def testapp(app):
+def tm():
+    tm = transaction.manager
+    tm.begin()
+    tm.doom()
+
+    yield tm
+
+    tm.abort()
+
+@pytest.fixture
+def testapp(app, tm):
     testapp = webtest.TestApp(app, extra_environ={
         'HTTP_HOST': 'example.com',
+        'tm.active': True,
+        'tm.manager': tm,
     })
 
     return testapp
 
 @pytest.fixture
-def app_request(app):
+def app_request(app, tm):
     """
     A real request.
 
@@ -44,12 +57,13 @@ def app_request(app):
     env = prepare(registry=app.registry)
     request = env['request']
     request.host = 'example.com'
+    request.tm = tm
 
     yield request
     env['closer']()
 
 @pytest.fixture
-def dummy_request(app):
+def dummy_request(app, tm):
     """
     A lightweight dummy request.
 
@@ -65,5 +79,6 @@ def dummy_request(app):
     request = DummyRequest()
     request.registry = app.registry
     request.host = 'example.com'
+    request.tm = tm
 
     return request
-- 
cgit v1.2.3