From 4316430d002cc3701d0eb4db1309ecbb0eb337a2 Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Fri, 3 Aug 2018 22:54:44 +0800
Subject: [PATCH 1/4] fix #330: display response headers in report

---
 httprunner/templates/report_template.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httprunner/templates/report_template.html b/httprunner/templates/report_template.html
index 03ba45f2..798b91f0 100644
--- a/httprunner/templates/report_template.html
+++ b/httprunner/templates/report_template.html
@@ -279,7 +279,7 @@
                         <th>{{key}}</th>
                         <td>
                           {% if key == "headers" %}
-                            {% for header_key, header_value in record.meta_data.request.headers.items() %}
+                            {% for header_key, header_value in record.meta_data.response.headers.items() %}
                             <div>
                               <strong>{{ header_key }}</strong>: {{ header_value }}
                             </div>

From c7fa4f85975698077efc035834a44c90ce1e4d24 Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Fri, 3 Aug 2018 23:36:05 +0800
Subject: [PATCH 2/4] fix #332: display image type

---
 httprunner/report.py                      | 8 +++-----
 httprunner/templates/report_template.html | 6 +++---
 2 files changed, 6 insertions(+), 8 deletions(-)

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 @@
               <div style="overflow: auto">
                 <table>
                     {% 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 %}
                       <tr>
@@ -284,8 +284,8 @@
                               <strong>{{ header_key }}</strong>: {{ header_value }}
                             </div>
                             {% endfor %}
-                          {% elif key == "text" %}
-                            {% if value == "image" %}
+                          {% elif key == "content" %}
+                            {% if "image" in record.meta_data.response.content_type %}
                               <img src="{{ record.meta_data.response.content }}" />
                             {% else %}
                               <pre>{{ record.meta_data.response.text | e }}</pre>

From 38a6bb1227bd0e72fb7be624d0b2c4f8fe25a48c Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Fri, 3 Aug 2018 23:42:20 +0800
Subject: [PATCH 3/4] fix unstability in unittest

---
 tests/test_response.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_response.py b/tests/test_response.py
index 06d78649..a28cb699 100644
--- a/tests/test_response.py
+++ b/tests/test_response.py
@@ -135,7 +135,7 @@ class TestResponse(ApiServerUnittest):
         ]
         extract_binds_dict = resp_obj.extract_response(extract_binds_list)
         self.assertGreater(extract_binds_dict["resp_elapsed_microseconds"], 1000)
-        self.assertEqual(extract_binds_dict["resp_elapsed_seconds"], 0)
+        self.assertLess(extract_binds_dict["resp_elapsed_seconds"], 3)
         self.assertEqual(extract_binds_dict["resp_elapsed_days"], 0)
         self.assertGreater(extract_binds_dict["resp_elapsed_total_seconds"], 0)
 

From a650c964ec00fcbc3ef786269ccb721bf86919c1 Mon Sep 17 00:00:00 2001
From: debugtalk <mail@debugtalk.com>
Date: Fri, 3 Aug 2018 23:54:27 +0800
Subject: [PATCH 4/4] bump to v1.5.9

---
 httprunner/__about__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/httprunner/__about__.py b/httprunner/__about__.py
index e7674ab8..c146d7ef 100644
--- a/httprunner/__about__.py
+++ b/httprunner/__about__.py
@@ -1,7 +1,7 @@
 __title__ = 'HttpRunner'
 __description__ = 'One-stop solution for HTTP(S) testing.'
 __url__ = 'https://github.com/HttpRunner/HttpRunner'
-__version__ = '1.5.8'
+__version__ = '1.5.9'
 __author__ = 'debugtalk'
 __author_email__ = 'mail@debugtalk.com'
 __license__ = 'MIT'