Merge branch '0.10-maintenance'

flask/testing.py

@@ -31,6 +31,8 @@ def make_test_environ_builder(app, path='/', base_url=None, *args, **kwargs):
             base_url += app_root.lstrip('/')
         if url.netloc:
             path = url.path
+            if url.query:
+                path += '?' + url.query
     return EnvironBuilder(path, base_url, *args, **kwargs)
 
 

flask/testsuite/testing.py

@@ -196,6 +196,20 @@ class TestToolsTestCase(FlaskTestCase):
             self.assert_equal(called, [None])
         self.assert_equal(called, [None, None])
 
+    def test_full_url_request(self):
+        app = flask.Flask(__name__)
+        app.testing = True
+
+        @app.route('/action', methods=['POST'])
+        def action():
+            return 'x'
+
+        with app.test_client() as c:
+            rv = c.post('http://domain.com/action?vodka=42', data={'gin': 43})
+            self.assert_equal(rv.status_code, 200)
+            self.assert_('gin' in flask.request.form)
+            self.ssert_('vodka' in flask.request.args)
+
 
 class SubdomainTestCase(FlaskTestCase):