mirror of
https://github.com/httpie/cli.git
synced 2024-11-24 08:22:22 +02:00
4f1c9441c5
* Fix encoding error with non-prettified encoded responses
Removed `--format-option response.as` an promote `--response-as`: using
the format option would be misleading as it is now also used by non-prettified
responses.
* Encoding refactoring
* split --response-as into --response-mime and --response-charset
* add support for Content-Type charset for requests printed to terminal
* add support charset detection for requests printed to terminal without a Content-Type charset
* etc.
* `test_unicode.py` → `test_encoding.py`
* Drop sequence length check
* Clean-up tests
* [skip ci] Tweaks
* Use the compatible release clause for `charset_normalizer` requirement
Cf. https://www.python.org/dev/peps/pep-0440/#version-specifiers
* Clean-up
* Partially revert d52a4833e4
* Changelog
* Tweak tests
* [skip ci] Better test name
* Cleanup tests and add request body charset detection
* More test suite cleanups
* Cleanup
* Fix code style in test
* Improve detect_encoding() docstring
* Uniformize pytest.mark.parametrize() calls
* [skip ci] Comment out TODOs (will be tackled in a specific PR)
Co-authored-by: Jakub Roztocil <jakub@roztocil.co>
100 lines
2.8 KiB
Python
100 lines
2.8 KiB
Python
import sys
|
|
|
|
import pytest
|
|
import responses
|
|
|
|
from httpie.encoding import UTF8
|
|
from httpie.output.formatters.xml import parse_xml, pretty_xml
|
|
|
|
from .fixtures import XML_FILES_PATH, XML_FILES_VALID, XML_FILES_INVALID, XML_DATA_RAW, XML_DATA_FORMATTED
|
|
from .utils import http, DUMMY_URL
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
'options, expected_xml',
|
|
[
|
|
('xml.format:false', XML_DATA_RAW),
|
|
('xml.indent:2', XML_DATA_FORMATTED),
|
|
('xml.indent:4', pretty_xml(parse_xml(XML_DATA_RAW), indent=4)),
|
|
]
|
|
)
|
|
@responses.activate
|
|
def test_xml_format_options(options, expected_xml):
|
|
responses.add(
|
|
responses.GET,
|
|
DUMMY_URL,
|
|
body=XML_DATA_RAW,
|
|
content_type='application/xml',
|
|
)
|
|
|
|
r = http('--format-options', options, DUMMY_URL)
|
|
assert expected_xml in r
|
|
|
|
|
|
@pytest.mark.parametrize('file', XML_FILES_VALID)
|
|
@responses.activate
|
|
def test_valid_xml(file):
|
|
"""Test XML formatter limits with data containing comments, doctypes
|
|
and other XML-specific subtles.
|
|
"""
|
|
if 'standalone' in file.stem and sys.version_info < (3, 9):
|
|
pytest.skip('Standalone XML requires Python 3.9+')
|
|
|
|
xml_data = file.read_text(encoding=UTF8)
|
|
expected_xml_file = file.with_name(file.name.replace('_raw', '_formatted'))
|
|
expected_xml_output = expected_xml_file.read_text(encoding=UTF8)
|
|
responses.add(
|
|
responses.GET,
|
|
DUMMY_URL,
|
|
body=xml_data,
|
|
content_type='application/xml',
|
|
)
|
|
|
|
r = http(DUMMY_URL)
|
|
assert expected_xml_output in r
|
|
|
|
|
|
@responses.activate
|
|
def test_xml_xhtml():
|
|
"""XHTML responses are handled by the XML formatter."""
|
|
file = XML_FILES_PATH / 'xhtml' / 'xhtml_raw.xml'
|
|
xml_data = file.read_text(encoding=UTF8)
|
|
|
|
# Python < 3.8 was sorting attributes (https://bugs.python.org/issue34160)
|
|
# so we have 2 different output expected given the Python version.
|
|
expected_file_name = (
|
|
'xhtml_formatted_python_less_than_3.8.xml'
|
|
if sys.version_info < (3, 8)
|
|
else 'xhtml_formatted.xml'
|
|
)
|
|
expected_xml_file = file.with_name(expected_file_name)
|
|
expected_xml_output = expected_xml_file.read_text(encoding=UTF8)
|
|
responses.add(
|
|
responses.GET,
|
|
DUMMY_URL,
|
|
body=xml_data,
|
|
content_type='application/xhtml+xml',
|
|
)
|
|
|
|
r = http(DUMMY_URL)
|
|
assert expected_xml_output in r
|
|
|
|
|
|
@pytest.mark.parametrize('file', XML_FILES_INVALID)
|
|
@responses.activate
|
|
def test_invalid_xml(file):
|
|
"""Testing several problematic XML files, none should be formatted
|
|
and none should make HTTPie to crash.
|
|
"""
|
|
xml_data = file.read_text(encoding=UTF8)
|
|
responses.add(
|
|
responses.GET,
|
|
DUMMY_URL,
|
|
body=xml_data,
|
|
content_type='application/xml',
|
|
)
|
|
|
|
# No formatting done, data is simply printed as-is.
|
|
r = http(DUMMY_URL)
|
|
assert xml_data in r
|