X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/084a110efb1244bdecae1f02f63957e90ae9bd9f..d09b268e01987541384f55469cbd6ddd3ad2d5fe:/tests/steps/api_setup.py?ds=sidebyside diff --git a/tests/steps/api_setup.py b/tests/steps/api_setup.py index dc39a3bc..fcaa39a2 100644 --- 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] @@ -104,7 +104,7 @@ def api_setup_reverse(step, fmt, lat, lon): api_call('reverse') @step(u'looking up place ([NRW]?\d+)') -def api_setup_details(step, obj): +def api_setup_details_reverse(step, obj): if obj[0] in ('N', 'R', 'W'): # an osm id world.params['osm_type'] = obj[0] @@ -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)