diff options
| -rw-r--r-- | tests/test_middleware.py | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/tests/test_middleware.py b/tests/test_middleware.py index 685853ab..f9858505 100644 --- a/tests/test_middleware.py +++ b/tests/test_middleware.py @@ -11,7 +11,13 @@ CONF = config.CONF def make_request(**kwargs): - return webob.Request.blank('/', **kwargs) + method = kwargs.pop('method', 'GET') + body = kwargs.pop('body', None) + req = webob.Request.blank('/', **kwargs) + req.method = method + if body is not None: + req.body = body + return req class TokenAuthMiddlewareTest(test.TestCase): @@ -41,7 +47,7 @@ class AdminTokenAuthMiddlewareTest(test.TestCase): class PostParamsMiddlewareTest(test.TestCase): def test_request_with_params(self): - req = make_request(POST={"arg1": "one"}) + req = make_request(body="arg1=one", method='POST') middleware.PostParamsMiddleware(None).process_request(req) params = req.environ[middleware.PARAMS_ENV] self.assertEqual(params, {"arg1": "one"}) @@ -50,27 +56,30 @@ class PostParamsMiddlewareTest(test.TestCase): class JsonBodyMiddlewareTest(test.TestCase): def test_request_with_params(self): req = make_request(body='{"arg1": "one", "arg2": ["a"]}', - content_type='application/json') + content_type='application/json', + method='POST') middleware.JsonBodyMiddleware(None).process_request(req) params = req.environ[middleware.PARAMS_ENV] self.assertEqual(params, {"arg1": "one", "arg2": ["a"]}) def test_malformed_json(self): req = make_request(body='{"arg1": "on', - content_type='application/json') + content_type='application/json', + method='POST') _middleware = middleware.JsonBodyMiddleware(None) self.assertRaises(webob.exc.HTTPBadRequest, _middleware.process_request, req) def test_no_content_type(self): - req = make_request(body='{"arg1": "one", "arg2": ["a"]}') + req = make_request(body='{"arg1": "one", "arg2": ["a"]}', method='POST') middleware.JsonBodyMiddleware(None).process_request(req) params = req.environ[middleware.PARAMS_ENV] self.assertEqual(params, {"arg1": "one", "arg2": ["a"]}) def test_unrecognized_content_type(self): req = make_request(body='{"arg1": "one", "arg2": ["a"]}', - content_type='text/plain') + content_type='text/plain', + method='POST') middleware.JsonBodyMiddleware(None).process_request(req) params = req.environ.get(middleware.PARAMS_ENV, {}) self.assertEqual(params, {}) |