Merge pull request #77 from homm/master

Fix json detection in response

1 files changed, 18 insertions, 1 deletions

diff --git a/tests/test_response.py b/tests/test_response.py
index 43d6cd0..928903b 100644
--- a/tests/test_response.py
+++ b/tests/test_response.py
@@ -102,7 +102,8 @@ def links_app(environ, start_response):
                     <a href='/foo/'>Foo Bar<span class='baz qux'>Quz</span></a>
                 </body>
             </html>
-        """
+        """,
+        '/json/' : '{"foo": "bar"}',
     }
 
     utf8_paths = ['/utf8/']
@@ -353,6 +354,22 @@ class TestResponse(unittest.TestCase):
         resp.content_type = 'text/xml'
         resp.xml
 
+    def test_json(self):
+        app = webtest.TestApp(links_app)
+
+        resp = app.get('/json/')
+        with self.assertRaises(AttributeError):
+            resp.json
+
+        resp.content_type = 'text/json'
+        self.assertIn('foo', resp.json)
+
+        resp.content_type = 'application/json'
+        self.assertIn('foo', resp.json)
+
+        resp.content_type = 'application/vnd.webtest+json'
+        self.assertIn('foo', resp.json)
+
     def test_unicode(self):
         app = webtest.TestApp(links_app)