summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakolechkin <anton.kolechkin@gmail.com>2011-05-22 08:09:43 +0700
committerMarcel Hellkamp <marc@gsites.de>2011-06-05 19:24:37 +0200
commit8ab95bd52921827241c1aed7300da098f1eed338 (patch)
tree854288a328af60cc8c2db63b3b6c8d66de0f29eb
parent556a38a3158202c6fab12392858e18bd7d7a93af (diff)
downloadbottle-8ab95bd52921827241c1aed7300da098f1eed338.tar.gz
Fix: AttributeError in is_ajax (fix #162)
-rwxr-xr-xbottle.py2
-rwxr-xr-xtest/test_environ.py10
2 files changed, 11 insertions, 1 deletions
diff --git a/bottle.py b/bottle.py
index 28f679c..162cbe4 100755
--- a/bottle.py
+++ b/bottle.py
@@ -1004,7 +1004,7 @@ class Request(threading.local, DictMixin):
def is_ajax(self):
''' True if the request was generated using XMLHttpRequest '''
#TODO: write tests
- return self.header.get('X-Requested-With') == 'XMLHttpRequest'
+ return self.headers.get('X-Requested-With') == 'XMLHttpRequest'
class Response(threading.local):
diff --git a/test/test_environ.py b/test/test_environ.py
index f917e70..ff9630a 100755
--- a/test/test_environ.py
+++ b/test/test_environ.py
@@ -222,6 +222,16 @@ class TestRequest(unittest.TestCase):
self.assertEqual(42, len(request.body.readline()))
self.assertEqual(42, len(request.body.readline(1024)))
+ def test_isajax(self):
+ e = {}
+ wsgiref.util.setup_testing_defaults(e)
+ request.bind(e)
+ self.assertFalse(request.is_ajax)
+ e['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
+ self.assertTrue(request.is_ajax)
+
+
+
class TestResponse(unittest.TestCase):
def setUp(self):
response.bind()