Merge pull request #639 from adamtheturtle/separate-date-format-check

Separate date format check

Author: adamtheturtle

src/mock_vws/_mock_web_query_api.py

@@ -278,14 +278,14 @@ def validate_include_target_data(
 
 
 @wrapt.decorator
-def validate_date(
+def validate_date_format(
     wrapped: Callable[..., str],
     instance: Any,  # pylint: disable=unused-argument
     args: Tuple[_RequestObjectProxy, _Context],
     kwargs: Dict,
 ) -> str:
     """
-    Validate the date header given to the query endpoint.
+    Validate the format of the date header given to the query endpoint.
 
     Args:
         wrapped: An endpoint function for `requests_mock`.
@@ -296,12 +296,11 @@ def validate_date(
     Returns:
         The result of calling the endpoint.
         An `UNAUTHORIZED` response if the date is in the wrong format.
-        A `FORBIDDEN` response if the date is out of range.
     """
     request, context = args
 
     try:
-        date_from_header = datetime.datetime.strptime(
+        datetime.datetime.strptime(
             request.headers['Date'],
             '%a, %d %b %Y %H:%M:%S GMT',
         )
@@ -313,6 +312,36 @@ def validate_date(
         context.headers['Content-Type'] = content_type
         return text
 
+    return wrapped(*args, **kwargs)
+
+
+@wrapt.decorator
+def validate_date(
+    wrapped: Callable[..., str],
+    instance: Any,  # pylint: disable=unused-argument
+    args: Tuple[_RequestObjectProxy, _Context],
+    kwargs: Dict,
+) -> str:
+    """
+    Validate date in the date header given to the query endpoint.
+
+    Args:
+        wrapped: An endpoint function for `requests_mock`.
+        instance: The class that the endpoint function is in.
+        args: The arguments given to the endpoint function.
+        kwargs: The keyword arguments given to the endpoint function.
+
+    Returns:
+        The result of calling the endpoint.
+        A `FORBIDDEN` response if the date is out of range.
+    """
+    request, context = args
+
+    date_from_header = datetime.datetime.strptime(
+        request.headers['Date'],
+        '%a, %d %b %Y %H:%M:%S GMT',
+    )
+
     gmt = pytz.timezone('GMT')
     now = datetime.datetime.now(tz=gmt)
     date_from_header = date_from_header.replace(tzinfo=gmt)
@@ -527,6 +556,7 @@ def decorator(method: Callable[..., str]) -> Callable[..., str]:
         decorators = [
             validate_authorization,
             validate_date,
+            validate_date_format,
             validate_date_header_given,
             validate_include_target_data,
             validate_max_num_results,

tests/mock_vws/test_query.py

@@ -525,7 +525,7 @@ def test_default(
         assert len(response.json()['results']) == 1
 
     @pytest.mark.parametrize('num_results', [1, b'1', 50])
-    def test_valid_foo(
+    def test_valid_accepted(
         self,
         high_quality_image: io.BytesIO,
         vuforia_database_keys: VuforiaDatabaseKeys,