maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Merge branch 'master' of github.com:mitsuhiko/flask

Browse source
This commit is contained in:
Armin Ronacher 2011-09-07 11:44:33 +02:00
commit b1311bd8cd
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flask/testing.py
View file

@ -59,7 +59,7 @@ class FlaskClient(Client):
raise RuntimeError('Session transactions only make sense ' raise RuntimeError('Session transactions only make sense '
'with cookies enabled.') 'with cookies enabled.')
app = self.application app = self.application
environ_overrides = kwargs.pop('environ_overrides', {}) environ_overrides = kwargs.setdefault('environ_overrides', {})
self.cookie_jar.inject_wsgi(environ_overrides) self.cookie_jar.inject_wsgi(environ_overrides)
outer_reqctx = _request_ctx_stack.top outer_reqctx = _request_ctx_stack.top
with app.test_request_context(*args, **kwargs) as c: with app.test_request_context(*args, **kwargs) as c:

3
flask/testsuite/testing.py
View file

@ -62,6 +62,9 @@ class TestToolsTestCase(FlaskTestCase):
self.assert_equal(len(sess), 1) self.assert_equal(len(sess), 1)
rv = c.get('/') rv = c.get('/')
self.assert_equal(rv.data, '[42]') self.assert_equal(rv.data, '[42]')
with c.session_transaction() as sess:
self.assert_equal(len(sess), 1)
self.assert_equal(sess['foo'], [42])
def test_session_transactions_no_null_sessions(self): def test_session_transactions_no_null_sessions(self):
app = flask.Flask(__name__) app = flask.Flask(__name__)