Merge branch 'set-exception-handler-by-request-format' of https://github.com/mtmail...

[nominatim.git] / test / bdd / steps / queries.py

diff --git a/test/bdd/steps/queries.py b/test/bdd/steps/queries.py
index df34b5cc0696fc17d156a5500fb4047cb03b5b8f..4d59b923ed3c39b9fee9f7556b6fe31ea7c49417 100644 (file)
--- a/test/bdd/steps/queries.py
+++ b/test/bdd/steps/queries.py
@@ -494,6 +494,18 @@ def step_impl(context, fmt):
     context.execute_steps("Then a HTTP 200 is returned")
     eq_(context.response.format, fmt)
 
     context.execute_steps("Then a HTTP 200 is returned")
     eq_(context.response.format, fmt)
 

+@then(u'a (?P<fmt>\w+) user error is returned')
+def check_page_error(context, fmt):
+    context.execute_steps("Then a HTTP 400 is returned")
+    eq_(context.response.format, fmt)
+
+    if fmt == 'html':
+        assert_is_not_none(re.search(r'<html( |>).+</html>', context.response.page, re.DOTALL))
+    elif fmt == 'xml':
+        assert_is_not_none(re.search(r'<error>.+</error>', context.response.page, re.DOTALL))
+    else:
+        assert_is_not_none(re.search(r'({"error":)', context.response.page, re.DOTALL))
+

 @then(u'result header contains')
 def check_header_attr(context):
     for line in context.table:
 @then(u'result header contains')
 def check_header_attr(context):
     for line in context.table: