mirror of
https://github.com/httpie/cli.git
synced 2025-08-10 00:29:08 +02:00
Fix duplicate keys preservation of JSON data (#1163)
* Fix duplicate keys preservation of JSON data * Update issue number * Fix type annotations * Changes after review * Rewording
This commit is contained in:
committed by
GitHub
parent
e6c5cd3e4b
commit
d7ed45bbcd
@ -6,13 +6,29 @@ import responses
|
||||
from httpie.cli.constants import PRETTY_MAP
|
||||
from httpie.compat import is_windows
|
||||
from httpie.output.formatters.colors import ColorFormatter
|
||||
from httpie.utils import JsonDictPreservingDuplicateKeys
|
||||
|
||||
from .fixtures import JSON_WITH_DUPE_KEYS_FILE_PATH
|
||||
from .utils import MockEnvironment, http, URL_EXAMPLE
|
||||
|
||||
TEST_JSON_XXSI_PREFIXES = (r")]}',\n", ")]}',", 'while(1);', 'for(;;)', ')', ']', '}')
|
||||
TEST_JSON_VALUES = ({}, {'a': 0, 'b': 0}, [], ['a', 'b'], 'foo', True, False, None) # FIX: missing int & float
|
||||
TEST_PREFIX_TOKEN_COLOR = '\x1b[38;5;15m' if is_windows else '\x1b[04m\x1b[91m'
|
||||
|
||||
JSON_WITH_DUPES_RAW = '{"key": 15, "key": 15, "key": 3, "key": 7}'
|
||||
JSON_WITH_DUPES_FORMATTED_SORTED = '''{
|
||||
"key": 3,
|
||||
"key": 7,
|
||||
"key": 15,
|
||||
"key": 15
|
||||
}'''
|
||||
JSON_WITH_DUPES_FORMATTED_UNSORTED = '''{
|
||||
"key": 15,
|
||||
"key": 15,
|
||||
"key": 3,
|
||||
"key": 7
|
||||
}'''
|
||||
|
||||
|
||||
@pytest.mark.parametrize('data_prefix', TEST_JSON_XXSI_PREFIXES)
|
||||
@pytest.mark.parametrize('json_data', TEST_JSON_VALUES)
|
||||
@ -38,3 +54,35 @@ def test_json_formatter_with_body_preceded_by_non_json_data(data_prefix, json_da
|
||||
# meaning it was correctly handled as a whole.
|
||||
assert TEST_PREFIX_TOKEN_COLOR + data_prefix in expected_body, expected_body
|
||||
assert expected_body in r
|
||||
|
||||
|
||||
@responses.activate
|
||||
def test_duplicate_keys_support_from_response():
|
||||
"""JSON with duplicate keys should be handled correctly."""
|
||||
responses.add(responses.GET, URL_EXAMPLE, body=JSON_WITH_DUPES_RAW,
|
||||
content_type='application/json')
|
||||
args = ('--pretty', 'format', URL_EXAMPLE)
|
||||
|
||||
# Check implicit --sorted
|
||||
if JsonDictPreservingDuplicateKeys.SUPPORTS_SORTING:
|
||||
r = http(*args)
|
||||
assert JSON_WITH_DUPES_FORMATTED_SORTED in r
|
||||
|
||||
# Check --unsorted
|
||||
r = http(*args, '--unsorted')
|
||||
assert JSON_WITH_DUPES_FORMATTED_UNSORTED in r
|
||||
|
||||
|
||||
def test_duplicate_keys_support_from_input_file():
|
||||
"""JSON file with duplicate keys should be handled correctly."""
|
||||
args = ('--verbose', '--offline', URL_EXAMPLE,
|
||||
f'@{JSON_WITH_DUPE_KEYS_FILE_PATH}')
|
||||
|
||||
# Check implicit --sorted
|
||||
if JsonDictPreservingDuplicateKeys.SUPPORTS_SORTING:
|
||||
r = http(*args)
|
||||
assert JSON_WITH_DUPES_FORMATTED_SORTED in r
|
||||
|
||||
# Check --unsorted
|
||||
r = http(*args, '--unsorted')
|
||||
assert JSON_WITH_DUPES_FORMATTED_UNSORTED in r
|
||||
|
Reference in New Issue
Block a user