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

Merged in changes from master by hand

Browse source
This commit is contained in:
Armin Ronacher 2010-07-04 11:25:26 +02:00
parent 81148db5b6
commit 8798b4b711
3 changed files with 37 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/flask_tests.py
View file

@ -21,7 +21,6 @@ from contextlib import contextmanager
from datetime import datetime
from werkzeug import parse_date, parse_options_header
from cStringIO import StringIO
from flask.helpers import json
example_path = os.path.join(os.path.dirname(__file__), '..', 'examples')
sys.path.append(os.path.join(example_path, 'flaskr'))
@ -409,7 +408,7 @@ class JSONTestCase(unittest.TestCase):
for url in '/kw', '/dict':
rv = c.get(url)
assert rv.mimetype == 'application/json'
assert json.loads(rv.data) == d
assert flask.json.loads(rv.data) == d
def test_json_attr(self):
app = flask.Flask(__name__)
@ -417,7 +416,7 @@ class JSONTestCase(unittest.TestCase):
def add():
return unicode(flask.request.json['a'] + flask.request.json['b'])
c = app.test_client()
rv = c.post('/add', data=json.dumps({'a': 1, 'b': 2}),
rv = c.post('/add', data=flask.json.dumps({'a': 1, 'b': 2}),
content_type='application/json')
assert rv.data == '3'