diff --git a/httprunner/report.py b/httprunner/report.py index cfdb8fea..35dcae3f 100644 --- a/httprunner/report.py +++ b/httprunner/report.py @@ -120,9 +120,7 @@ def stringify_data(meta_data, request_or_response): } """ headers = meta_data[request_or_response]["headers"] - request_or_response_dict = meta_data[request_or_response] - response_content_type = meta_data["response"]["content_type"] for key, value in request_or_response_dict.items(): @@ -135,11 +133,11 @@ def stringify_data(meta_data, request_or_response): if not encoding or encoding == "None": encoding = "utf-8" - if request_or_response == "response" and key == "content" and "image" in response_content_type: + if request_or_response == "response" and key == "content" \ + and "image" in meta_data["response"]["content_type"]: # display image - meta_data["response"]["content_type"] = "image" value = "data:{};base64,{}".format( - response_content_type, + meta_data["response"]["content_type"], b64encode(value).decode(encoding) ) else: diff --git a/httprunner/templates/report_template.html b/httprunner/templates/report_template.html index 798b91f0..03356661 100644 --- a/httprunner/templates/report_template.html +++ b/httprunner/templates/report_template.html @@ -272,7 +272,7 @@
{% for key, value in record.meta_data.response.items() %} - {% if key in ["content", "json", "elapsed_ms", "response_time_ms", "content_size", "content_type"] %} + {% if key in ["text", "json", "elapsed_ms", "response_time_ms", "content_size", "content_type"] %} {% continue %} {% endif %} @@ -284,8 +284,8 @@ {{ header_key }}: {{ header_value }} {% endfor %} - {% elif key == "text" %} - {% if value == "image" %} + {% elif key == "content" %} + {% if "image" in record.meta_data.response.content_type %} {% else %}
{{ record.meta_data.response.text | e }}