orbit-oss/flask
4
4
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into sprint-branch

Browse source
This commit is contained in:
Armin Ronacher 2013-05-23 14:01:33 +01:00
commit 16df96c552
6 changed files with 17 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

14
flask/testsuite/helpers.py
View file

@ -33,23 +33,11 @@ class JSONTestCase(FlaskTestCase):
app = flask.Flask(__name__)
@app.route('/json', methods=['POST'])
def return_json():
return text_type(flask.request.json)
return flask.jsonify(foo=text_type(flask.request.json))
c = app.test_client()
rv = c.post('/json', data='malformed', content_type='application/json')
self.assert_equal(rv.status_code, 400)
def test_json_bad_requests_content_type(self):
app = flask.Flask(__name__)
@app.route('/json', methods=['POST'])
def return_json():
return text_type(flask.request.json)
c = app.test_client()
rv = c.post('/json', data='malformed', content_type='application/json')
self.assert_equal(rv.status_code, 400)
self.assert_equal(rv.mimetype, 'application/json')
self.assert_in('description', flask.json.loads(rv.data))
self.assert_not_in('<p>', flask.json.loads(rv.data)['description'])
def test_json_body_encoding(self):
app = flask.Flask(__name__)
app.testing = True