diff options
author | Marcel Hellkamp <marc@gsites.de> | 2011-05-02 18:39:25 +0200 |
---|---|---|
committer | Marcel Hellkamp <marc@gsites.de> | 2011-05-02 20:12:17 +0200 |
commit | c3d85bdc2ab7dfd3060f0d0032d073f4b4210927 (patch) | |
tree | f9a526781e7f29755096ab1839954571c51092ca | |
parent | fc8dfa294d83a92f8251280291c130b56f10fbfb (diff) | |
download | bottle-c3d85bdc2ab7dfd3060f0d0032d073f4b4210927.tar.gz |
Added basic tests for the werkzeug plugin.
-rw-r--r-- | plugins/werkzeug/bottle_werkzeug.py | 4 | ||||
-rw-r--r-- | plugins/werkzeug/test.py | 23 |
2 files changed, 25 insertions, 2 deletions
diff --git a/plugins/werkzeug/bottle_werkzeug.py b/plugins/werkzeug/bottle_werkzeug.py index 61fbfe8..1e68996 100644 --- a/plugins/werkzeug/bottle_werkzeug.py +++ b/plugins/werkzeug/bottle_werkzeug.py @@ -21,7 +21,7 @@ Example:: @app.route('/hello/:name') def say_hello(name): greet = {'en':'Hello', 'de':'Hallo', 'fr':'Bonjour'} - language = wrequest.accept_language.best_match(greet.keys()) + language = wrequest.accept_languages.best_match(greet.keys()) if language: return werkzeug.Response('%s %s!' % (greet[language], name)) else: @@ -45,7 +45,7 @@ class WerkzeugPlugin(object): name = 'werkzeug' - def __init_(self, request_class=werkzeug.Request, **config): + def __init__(self, request_class=werkzeug.Request, **config): self.request_factory = request_class self.config = config self.app = None diff --git a/plugins/werkzeug/test.py b/plugins/werkzeug/test.py new file mode 100644 index 0000000..40a90bb --- /dev/null +++ b/plugins/werkzeug/test.py @@ -0,0 +1,23 @@ +import unittest +import os +import bottle +from bottle.ext import werkzeug as bw + +class WerkzeugTest(unittest.TestCase): + def setUp(self): + self.app = bottle.Bottle(catchall=False) + self.plugin = self.app.install(bw.WerkzeugPlugin()) + + def test_resquest_obj(self): + request = self.plugin.request + @self.app.get('/') + def test(): + self.assertEqual(request.environ, bottle.request.environ) + self.assertNotEqual(request, bottle.request) + self.assertEqual(request.accept_languages.best, 'de') + return repr(self.plugin.request) + self.app({'PATH_INFO':'/', 'REQUEST_METHOD':'GET', + 'HTTP_ACCEPT_LANGUAGE': 'de, en;q=0.7'}, lambda x, y: None) + +if __name__ == '__main__': + unittest.main() |