X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/3cdbcbff8f02d7b46dde503c32bc8327e4264f6f..9454761cca4bb3a2b0fa997797054d67078a2fcc:/test/bdd/steps/queries.py diff --git a/test/bdd/steps/queries.py b/test/bdd/steps/queries.py index 731dc1b5..5779c763 100644 --- a/test/bdd/steps/queries.py +++ b/test/bdd/steps/queries.py @@ -232,6 +232,10 @@ class DetailsResponse(GenericResponse): options={'char-encoding' : 'utf8'}) self.result = {} + def parse_json(self): + self.result = [json.JSONDecoder(object_pairs_hook=OrderedDict).decode(self.page)] + + @when(u'searching for "(?P.*)"(?P with dups)?') def query_cmd(context, query, dups): """ Query directly via PHP script. @@ -379,7 +383,12 @@ def website_details_request(context, fmt, query): params['place_id'] = query outp, status = send_api_query('details', params, fmt, context) - context.response = DetailsResponse(outp, 'html', status) + if fmt is None: + outfmt = 'html' + else: + outfmt = fmt.strip() + + context.response = DetailsResponse(outp, outfmt, status) @when(u'sending (?P\S+ )?lookup query for (?P.*)') def website_lookup_request(context, fmt, query):