fix(attachments): support null headers and cookies (fix allure-framework#767, via allure-framework#769)

infoShare · web-flow · commit d949bce9ea04 · 2022-06-10T17:23:09.000+07:00
diff --git a/allure-attachments/src/main/resources/tpl/http-request.ftl b/allure-attachments/src/main/resources/tpl/http-request.ftl
@@ -6,7 +6,7 @@
 <h4>Body</h4>
 <div>
     <pre class="preformated-text">
-    ${data.body}
+    <#t>${data.body}
     </pre>
 </div>
 </#if>
@@ -15,7 +15,7 @@
 <h4>Headers</h4>
 <div>
     <#list data.headers as name, value>
-        <div>${name}: ${value}</div>
+        <div>${name}: ${value!"null"}</div>
     </#list>
 </div>
 </#if>
@@ -25,7 +25,7 @@
 <h4>Cookies</h4>
 <div>
     <#list data.cookies as name, value>
-        <div>${name}: ${value}</div>
+        <div>${name}: ${value!"null"}</div>
     </#list>
 </div>
 </#if>
diff --git a/allure-attachments/src/main/resources/tpl/http-response.ftl b/allure-attachments/src/main/resources/tpl/http-response.ftl
@@ -7,7 +7,7 @@
 <h4>Body</h4>
 <div>
     <pre class="preformated-text">
-    ${data.body}
+    <#t>${data.body}
     </pre>
 </div>
 </#if>
@@ -16,7 +16,7 @@
 <h4>Headers</h4>
 <div>
     <#list data.headers as name, value>
-        <div>${name}: ${value}</div>
+        <div>${name}: ${value!"null"}</div>
     </#list>
 </div>
 </#if>
@@ -26,7 +26,7 @@
 <h4>Cookies</h4>
 <div>
     <#list data.cookies as name, value>
-        <div>${name}: ${value}</div>
+        <div>${name}: ${value!"null"}</div>
     </#list>
 </div>
 </#if>
diff --git a/allure-attachments/src/test/java/io/qameta/allure/attachment/testdata/TestData.java b/allure-attachments/src/test/java/io/qameta/allure/attachment/testdata/TestData.java
@@ -69,6 +69,7 @@ public static Map<String, String> randomMap() {
         final Map<String, String> map = new HashMap<>();
         map.put(randomString(), randomString());
         map.put(randomString(), randomString());
+        map.put(randomString(), null);
         return map;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ public static Map<String, String> randomMap() {`
`69`	`69`	`final Map<String, String> map = new HashMap<>();`
`70`	`70`	`map.put(randomString(), randomString());`
`71`	`71`	`map.put(randomString(), randomString());`
	`72`	`+ map.put(randomString(), null);`
`72`	`73`	`return map;`
`73`	`74`	`}`
`74`	`75`	`}`