Merge remote-tracking branch 'upstream/master'

[nominatim.git] / tests / steps / api_setup.py

diff --git a/tests/steps/api_setup.py b/tests/steps/api_setup.py
index ab08009654da3b768536d2efa8b6522533f08c4d..fcaa39a2adc91c01c4c9747f754562dc8f990452 100644 (file)
--- a/tests/steps/api_setup.py
+++ b/tests/steps/api_setup.py
@@ -36,7 +36,7 @@ def api_call(requesttype):
         world.response_format = fmt
     elif fmt in ('json', 'jsonv2'):
         if 'json_callback' in world.params:
-            world.json_callback = world.params['json_callback']
+            world.json_callback = world.params['json_callback'].encode('utf8')
             assert world.page.startswith(world.json_callback + '(')
             assert world.page.endswith(')')
             world.page = world.page[(len(world.json_callback)+1):-1]
@@ -122,3 +122,7 @@ def api_setup_details(step, obj):
     else:
         world.params['place_id']  = obj
     api_call('details')
+
+@step(u'sending an API call (\w+)')
+def api_general_call(step, call):
+    api_call(call)