HTTPServer: fix missing query_string parameter

csernazs · csernazs · commit 68ff91ad2d8c · 2018-08-14T17:11:11.000+02:00
Fix the missing query_string parameter which was added later to the
matcher so it was accidentally missing from the HTTPServer.
diff --git a/pytest_httpserver/httpserver.py b/pytest_httpserver/httpserver.py
@@ -4,6 +4,8 @@
 
 from werkzeug.wrappers import Request, Response
 from werkzeug.serving import make_server
+from typing import Mapping, Optional, Union
+
 
 URI_DEFAULT = ""
 METHOD_ALL = "__ALL"
@@ -200,7 +202,16 @@ def create_matcher(self, *args, **kwargs) -> RequestMatcher:
 
         return RequestMatcher(*args, **kwargs)
 
-    def expect_oneshot_request(self, uri, method=METHOD_ALL, data=None, data_encoding="utf-8", headers=None, *, ordered=False) -> RequestHandler:
+    def expect_oneshot_request(
+            self,
+            uri: str,
+            method: str = METHOD_ALL,
+            data: Union[str, bytes, None] = None,
+            data_encoding: str = "utf-8",
+            headers: Optional[Mapping[str, str]] = None,
+            query_string: Optional[str] = None,
+            *,
+            ordered=False) -> RequestHandler:
         """
         Create and register a oneshot request handler.
 
@@ -221,12 +232,13 @@ def expect_oneshot_request(self, uri, method=METHOD_ALL, data=None, data_encodin
             by default, see `data_encoding`) or a bytes object.
         :param data_encoding: the encoding used for data parameter if data is a string.
         :param headers: dictionary of the headers of the request to be matched
+        :param query_string: the http query string starting with ``?``, such as ``?username=user``
         :param ordered: specifies whether to create an ordered handler or not. See above for details.
 
         :return: Created and register :py:class:`RequestHandler`.
         """
 
-        matcher = self.create_matcher(uri, method=method, data=data, data_encoding=data_encoding, headers=headers)
+        matcher = self.create_matcher(uri, method=method, data=data, data_encoding=data_encoding, headers=headers, query_string=query_string)
         request_handler = RequestHandler(matcher)
         if ordered:
             self.ordered_handlers.append(request_handler)
@@ -235,7 +247,14 @@ def expect_oneshot_request(self, uri, method=METHOD_ALL, data=None, data_encodin
 
         return request_handler
 
-    def expect_request(self, uri, method=METHOD_ALL, data=None, data_encoding="utf-8", headers=None) -> RequestHandler:
+    def expect_request(
+            self,
+            uri: str,
+            method: str = METHOD_ALL,
+            data: Union[str, bytes, None] = None,
+            data_encoding: str = "utf-8",
+            headers: Optional[Mapping[str, str]] = None,
+            query_string: Optional[str] = None) -> RequestHandler:
         """
         Create and register a permanent request handler.
 
@@ -254,7 +273,7 @@ def expect_request(self, uri, method=METHOD_ALL, data=None, data_encoding="utf-8
         :return: Created and register :py:class:`RequestHandler`.
         """
 
-        matcher = self.create_matcher(uri, method=method, data=data, data_encoding=data_encoding, headers=headers)
+        matcher = self.create_matcher(uri, method=method, data=data, data_encoding=data_encoding, headers=headers, query_string=query_string)
         request_handler = RequestHandler(matcher)
         self.handlers.append(request_handler)
         return request_handler
