Newline added at the end of the files

hurlfmt now also outputs a trailing newline.

integration/test_format.py

@@ -25,7 +25,7 @@ def test(format_type, hurl_file):
     cmd = ["hurlfmt", "--format", format_type, hurl_file]
     print(" ".join(cmd))
     result = subprocess.run(cmd, stdout=subprocess.PIPE)
-    expected = open(output_file, encoding="utf-8").read().strip()
+    expected = open(output_file, encoding="utf-8").read()
     actual = decode_string(result.stdout)
     if actual != expected:
         print(f">>> error in stdout for {format_type}")

integration/test_html_output.py

@@ -16,7 +16,7 @@ def test(html_file):
     expected = codecs.open(
         hurl_file, encoding="utf-8-sig"
     ).read()  # Input file can be saved with a BOM
-    if actual != expected:
+    if actual.strip() != expected.strip():
         print(">>> error in html file")
         print(f"actual: <{actual}>\nexpected: <{expected}>")
         sys.exit(1)

integration/tests_error_lint/spaces.hurl

@@ -1 +1 @@
-GET	http://localhost:8000/hello 
+GET	http://localhost:8000/hello 

integration/tests_failed/assert_base64.html

@@ -11,4 +11,4 @@
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 <span class="line">base64,<span class="base64">bGluZTEKbGluZTIKbGluZTMK</span>;</span>
 </span></span><span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/assert_base64.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/assert-base64"},"response":{"version":"HTTP/1.0","status":200,"body":{"encoding":"base64","value":"bGluZTEKbGluZTIKbGluZTMK"}}}]}

integration/tests_failed/assert_bytearray.html

@@ -3,4 +3,4 @@
 <span class="line section-header">[Asserts]</span>
 <span class="line"><span class="query-type">bytes</span> <span class="predicate-type">equals</span> hex,<span class="hex">00</span>;</span>
 <span class="line"><span class="query-type">sha256</span> <span class="predicate-type">equals</span> hex,<span class="hex">a8100ae6aa1940d0b663bb31cd466142ebbdbd5187131b92d93818987832eb88</span>;</span>
-</span></span></code></pre>
+</span></span></code></pre>

integration/tests_failed/assert_bytearray.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-assert-bytearray"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"bytes"},"predicate":{"type":"equal","value":"AA==","encoding":"base64"}},{"query":{"type":"sha256"},"predicate":{"type":"equal","value":"qBAK5qoZQNC2Y7sxzUZhQuu9vVGHExuS2TgYmHgy64g=","encoding":"base64"}}]}}]}

integration/tests_failed/assert_content_encoding.html

@@ -2,4 +2,4 @@
 <span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/error/content-encoding</span></span>
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 <span class="raw"><span class="line">```Hello World!```</span></span>
-</span></span></code></pre>
+</span></span></code></pre>

integration/tests_failed/assert_content_encoding.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error/content-encoding"},"response":{"version":"HTTP/1.0","status":200,"body":{"type":"raw-string","value":"Hello World!"}}}]}

integration/tests_failed/assert_decompress.html

@@ -2,4 +2,4 @@
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 <span class="raw"><span class="line">```Hello World!```</span></span>
 </span></span><span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/assert_decompress.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-assert-decompress"},"response":{"version":"HTTP/1.0","status":200,"body":{"type":"raw-string","value":"Hello World!"}}}]}

integration/tests_failed/assert_file.html

@@ -7,4 +7,4 @@
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 <span class="line">file,<span class="filename">data.txt</span>;</span>
 </span></span><span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/assert_file.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-assert-file"},"response":{"version":"HTTP/1.0","status":200,"body":{"type":"file","filename":"data.txt"}}}]}

integration/tests_failed/assert_header_not_found.html

@@ -1,4 +1,4 @@
 <pre><code class="language-hurl"><span class="hurl-entry"><span class="request"><span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/error-assert-header-not-found</span></span>
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 <span class="line"><span class="string">Custom</span><span>:</span> <span class="string">???</span></span>
-</span></span></code></pre>
+</span></span></code></pre>

integration/tests_failed/assert_header_not_found.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-assert-header-not-found"},"response":{"version":"HTTP/1.0","status":200,"headers":[{"name":"Custom","value":"???"}]}}]}

integration/tests_failed/assert_header_value.html

@@ -4,4 +4,5 @@
 </span></span><span class="hurl-entry"><span class="request"><span class="line"></span>
 <span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/error-assert-header-value</span></span>
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
-<span class="line"><span class="string">Content-Type</span><span>:</span> <span class="string">???</span></span></span></span></code></pre>
+<span class="line"><span class="string">Content-Type</span><span>:</span> <span class="string">???</span></span>
+</span></span></code></pre>

integration/tests_failed/assert_header_value.hurl

@@ -4,4 +4,4 @@ Content-Type: ???
 
 GET http://localhost:8000/error-assert-header-value
 HTTP/1.0 200
-Content-Type: ???
+Content-Type: ???

integration/tests_failed/assert_header_value.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-assert-header-value"},"response":{"version":"HTTP/1.0","status":200,"headers":[{"name":"Content-Type","value":"???"}]}},{"request":{"method":"GET","url":"http://localhost:8000/error-assert-header-value"},"response":{"version":"HTTP/1.0","status":200,"headers":[{"name":"Content-Type","value":"???"}]}}]}

integration/tests_failed/assert_http_version.html

@@ -1,4 +1,4 @@
 <pre><code class="language-hurl"><span class="hurl-entry"><span class="request"><span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/error-assert/http-version</span></span>
 </span><span class="response"><span class="line"><span class="version">HTTP/2</span> <span class="number">200</span></span>
 </span></span><span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/assert_http_version.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-assert/http-version"},"response":{"version":"HTTP/2","status":200}}]}

integration/tests_failed/assert_invalid_predicate_type.html

@@ -3,4 +3,4 @@
 <span class="line section-header">[Asserts]</span>
 <span class="line"><span class="query-type">header</span> <span class="string">"content-type"</span> <span class="predicate-type">equals</span> <span class="number">1</span></span>
 </span></span><span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/assert_invalid_predicate_type.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-assert-invalid-predicate-type"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"header","name":"content-type"},"predicate":{"type":"equal","value":1}}]}}]}

integration/tests_failed/assert_match_utf8.html

@@ -3,4 +3,4 @@
 <span class="line section-header">[Asserts]</span>
 <span class="line"><span class="query-type">body</span> <span class="predicate-type">matches</span> <span class="string">".*"</span></span>
 </span></span><span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/assert_match_utf8.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-assert/match-utf8"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"body"},"predicate":{"type":"match","value":".*"}}]}}]}

integration/tests_failed/assert_newline.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-assert-newline"},"response":{"version":"HTTP/1.0","status":200,"body":{"type":"raw-string","value":"<p>Hello</p>\n"}}}]}

integration/tests_failed/assert_query_cookie.html

@@ -13,4 +13,4 @@
 </span></span><span class="line"></span>
 <span class="line"></span>
 <span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/assert_query_cookie.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-assert-query-cookie"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"cookie","expr":"cookie1[Secure]"},"predicate":{"not":true,"type":"exist"}},{"query":{"type":"cookie","expr":"cookie1[Secure]"},"predicate":{"type":"equal","value":false}},{"query":{"type":"cookie","expr":"cookie1[Secure]"},"predicate":{"not":true,"type":"equal","value":true}},{"query":{"type":"cookie","expr":"cookie2[Secure]"},"predicate":{"type":"exist"}},{"query":{"type":"cookie","expr":"cookie2[Secure]"},"predicate":{"type":"equal","value":true}},{"query":{"type":"cookie","expr":"cookie2[Secure]"},"predicate":{"not":true,"type":"equal","value":true}}]}}]}

integration/tests_failed/assert_query_invalid_regex.html

@@ -2,4 +2,4 @@
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 <span class="line section-header">[Asserts]</span>
 <span class="line"><span class="query-type">regex</span> <span class="string">"[x"</span> <span class="predicate-type">exists</span></span>
-</span></span></code></pre>
+</span></span></code></pre>

integration/tests_failed/assert_query_invalid_regex.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-assert-query-invalid-regex"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"regex","expr":"[x"},"predicate":{"type":"exist"}}]}}]}

integration/tests_failed/assert_query_invalid_xpath.html

@@ -2,4 +2,4 @@
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 <span class="line section-header">[Asserts]</span>
 <span class="line"><span class="query-type">xpath</span> <span class="string">"//"</span> <span class="predicate-type">equals</span> <span class="number">1</span></span>
-</span></span></code></pre>
+</span></span></code></pre>

integration/tests_failed/assert_query_invalid_xpath.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/utf8"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"xpath","expr":"//"},"predicate":{"type":"equal","value":1}}]}}]}

integration/tests_failed/assert_status.html

@@ -1,4 +1,4 @@
 <pre><code class="language-hurl"><span class="hurl-entry"><span class="request"><span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/not_found</span></span>
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 </span></span><span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/assert_status.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/not_found"},"response":{"version":"HTTP/1.0","status":200}}]}

integration/tests_failed/assert_template_variable_not_found.html

@@ -3,4 +3,4 @@
 <span class="line section-header">[Asserts]</span>
 <span class="line"><span class="query-type">header</span> <span class="string">"content-type"</span> <span class="predicate-type">equals</span> <span class="string">"{{content_type}}"</span></span>
 </span></span><span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/assert_template_variable_not_found.json

@@ -1 +1 @@
-{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-assert-template-variable-not-found"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"header","name":"content-type"},"predicate":{"type":"equal","value":"{{content_type}}"}}]}}]}
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-assert-template-variable-not-found"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"header","name":"content-type"},"predicate":{"type":"equal","value":"{{content_type}}"}}]}}]}

integration/tests_failed/assert_value_error.html

@@ -8,4 +8,5 @@
 <span class="line"><span class="query-type">jsonpath</span> <span class="string">"$.values"</span> <span class="not">not</span> <span class="predicate-type">contains</span> <span class="string">"Hello"</span></span>
 <span class="line"><span class="query-type">jsonpath</span> <span class="string">"$.count"</span> <span class="predicate-type">greaterThan</span> <span class="number">5</span></span>
 <span class="line"><span class="query-type">jsonpath</span> <span class="string">"$.count"</span> <span class="predicate-type">isFloat</span></span>
-<span class="line"><span class="query-type">bytes</span> <span class="predicate-type">contains</span> hex,<span class="hex">00</span>;</span></span></span></code></pre>
+<span class="line"><span class="query-type">bytes</span> <span class="predicate-type">contains</span> hex,<span class="hex">00</span>;</span>
+</span></span></code></pre>

integration/tests_failed/assert_value_error.hurl

@@ -8,4 +8,4 @@ jsonpath "$.values" includes 100
 jsonpath "$.values" not contains "Hello"
 jsonpath "$.count" greaterThan 5
 jsonpath "$.count" isFloat
-bytes contains hex,00;
+bytes contains hex,00;

integration/tests_failed/assert_value_error.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-assert-value"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"header","name":"content-type"},"predicate":{"type":"equal","value":"XXX"}},{"query":{"type":"header","name":"content-type"},"predicate":{"type":"not-equal","value":"text/html; charset=utf-8"}},{"query":{"type":"jsonpath","expr":"$.id"},"predicate":{"type":"equal","value":"000001"}},{"query":{"type":"jsonpath","expr":"$.values"},"predicate":{"type":"include","value":100}},{"query":{"type":"jsonpath","expr":"$.values"},"predicate":{"not":true,"type":"contain","value":"Hello"}},{"query":{"type":"jsonpath","expr":"$.count"},"predicate":{"type":"greater","value":5}},{"query":{"type":"jsonpath","expr":"$.count"},"predicate":{"type":"isFloat"}},{"query":{"type":"bytes"},"predicate":{"type":"contain","value":"AA==","encoding":"base64"}}]}}]}

integration/tests_failed/assert_variable.html

@@ -9,4 +9,4 @@
 <span class="line"><span class="query-type">variable</span> <span class="string">"status"</span> <span class="predicate-type">equals</span> <span class="expr">{{unknown}}</span></span>
 <span class="line"><span class="query-type">variable</span> <span class="string">"status"</span> <span class="predicate-type">equals</span> <span class="expr">{{type}}</span></span>
 <span class="line"><span class="query-type">variable</span> <span class="string">"status"</span> <span class="predicate-type">equals</span> <span class="expr">{{length}}</span></span>
-</span></span></code></pre>
+</span></span></code></pre>

integration/tests_failed/assert_variable.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-assert-variable"},"response":{"version":"HTTP/1.0","status":200,"captures":[{"name":"status","query":{"type":"status"}},{"name":"length","query":{"type":"header","name":"content-length"}},{"name":"type","query":{"type":"header","name":"content-type"}}],"asserts":[{"query":{"type":"variable","name":"toto"},"predicate":{"type":"equal","value":"tata"}},{"query":{"type":"variable","name":"status"},"predicate":{"type":"equal","value":"unknown"}},{"query":{"type":"variable","name":"status"},"predicate":{"type":"equal","value":"type"}},{"query":{"type":"variable","name":"status"},"predicate":{"type":"equal","value":"length"}}]}}]}

integration/tests_failed/assert_xpath.html

@@ -2,4 +2,4 @@
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 <span class="line section-header">[Asserts]</span>
 <span class="line"><span class="query-type">xpath</span> <span class="string">"strong(//head/title)"</span> <span class="predicate-type">equals</span> <span class="string">"Welcome to Quiz!"</span></span>
-</span></span></code></pre>
+</span></span></code></pre>

integration/tests_failed/assert_xpath.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-assert-xpath"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"xpath","expr":"strong(//head/title)"},"predicate":{"type":"equal","value":"Welcome to Quiz!"}}]}}]}

integration/tests_failed/body_json.html

@@ -2,4 +2,4 @@
 <span class="json"><span class="line">{</span>
 <span class="line">    "success": {{success}}</span>
 <span class="line">}</span></span>
-</span></span></code></pre>
+</span></span></code></pre>

integration/tests_failed/body_json.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"POST","url":"https://unused","body":{"type":"json","value":{"success":"{{success}}"}}}}]}

integration/tests_failed/connect_timeout.html

@@ -1,4 +1,4 @@
 <pre><code class="language-hurl"><span class="hurl-entry"><span class="request"><span class="line"><span class="method">GET</span> <span class="url">http://10.0.0.0</span></span>
 </span></span><span class="line"></span>
 <span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/connect_timeout.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://10.0.0.0"}}]}

integration/tests_failed/file_read_access.html

@@ -2,4 +2,4 @@
 <span class="line">file,<span class="filename">does_not_exist</span>;</span>
 </span><span class="response"><span class="line"></span>
 <span class="line"><span class="version">HTTP/1.1</span> <span class="number">200</span></span>
-</span></span></code></pre>
+</span></span></code></pre>

integration/tests_failed/file_read_access.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"POST","url":"http://localhost:8000/error-file-read-access","body":{"type":"file","filename":"does_not_exist"}},"response":{"version":"HTTP/1.1","status":200}}]}

integration/tests_failed/file_unauthorized.html

@@ -18,4 +18,5 @@
 <span class="line section-header">[MultipartFormData]</span>
 <span class="line"><span class="string"><span class="string">file1</span></span>: file,<span class="string"><span class="filename">../secret.txt</span></span>;</span>
 </span><span class="response"><span class="line"></span>
-<span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span></span></span></code></pre>
+<span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
+</span></span></code></pre>

integration/tests_failed/file_unauthorized.hurl

@@ -18,4 +18,4 @@ POST http://localhost:8000/post-file
 [MultipartFormData]
 file1: file,../secret.txt;
 
-HTTP/1.0 200
+HTTP/1.0 200

integration/tests_failed/file_unauthorized.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"POST","url":"http://localhost:8000/post-file","body":{"type":"file","filename":"/secret.txt"}},"response":{"version":"HTTP/1.0","status":200}},{"request":{"method":"POST","url":"http://localhost:8000/post-file","body":{"type":"file","filename":"../secret.txt"}},"response":{"version":"HTTP/1.0","status":200}},{"request":{"method":"POST","url":"http://localhost:8000/post-file","multipart_form_data":[{"name":"file1","filename":"/secret.txt"}]},"response":{"version":"HTTP/1.0","status":200}},{"request":{"method":"POST","url":"http://localhost:8000/post-file","multipart_form_data":[{"name":"file1","filename":"../secret.txt"}]},"response":{"version":"HTTP/1.0","status":200}}]}

integration/tests_failed/http_connection.html

@@ -1,3 +1,3 @@
 <pre><code class="language-hurl"><span class="hurl-entry"><span class="request"><span class="line"><span class="method">GET</span> <span class="url">http://unknown</span></span>
 </span></span><span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/http_connection.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://unknown"}}]}

integration/tests_failed/invalid_jsonpath.html

@@ -2,4 +2,4 @@
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 <span class="line section-header">[Asserts]</span>
 <span class="line"><span class="query-type">jsonpath</span> <span class="string">""</span> <span class="predicate-type">equals</span> <span class="boolean">false</span></span>
-</span></span></code></pre>
+</span></span></code></pre>

integration/tests_failed/invalid_jsonpath.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-invalid-jsonpath"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"jsonpath","expr":""},"predicate":{"type":"equal","value":false}}]}}]}

integration/tests_failed/invalid_url.html

@@ -1,3 +1,3 @@
 <pre><code class="language-hurl"><span class="hurl-entry"><span class="request"><span class="line"><span class="method">GET</span> <span class="url">https://???</span></span>
 </span></span><span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/invalid_url.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"https://???"}}]}

integration/tests_failed/invalid_xml.html

@@ -2,4 +2,4 @@
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 <span class="line section-header">[Asserts]</span>
 <span class="line"><span class="query-type">xpath</span> <span class="string">"xx"</span> <span class="predicate-type">equals</span> <span class="number">1</span></span>
-</span></span></code></pre>
+</span></span></code></pre>

integration/tests_failed/invalid_xml.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-invalid-xml"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"xpath","expr":"xx"},"predicate":{"type":"equal","value":1}}]}}]}

integration/tests_failed/max_redirect.html

@@ -2,4 +2,4 @@
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 </span></span><span class="line"></span>
 <span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/max_redirect.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/redirect/7"},"response":{"version":"HTTP/1.0","status":200}}]}

integration/tests_failed/multipart_form_data.html

@@ -6,4 +6,4 @@
 <span class="line"></span>
 <span class="line"></span>
 <span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/multipart_form_data.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"POST","url":"http://localhost:8000/unused","multipart_form_data":[{"name":"key1","value":"value1"},{"name":"upload1","filename":"unknown"}]}}]}

integration/tests_failed/option_max_redirect.html

@@ -6,4 +6,4 @@
 <span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 </span></span><span class="line"></span>
 <span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/option_max_redirect.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/redirect/7"},"response":{"version":"HTTP/1.0","status":200}}]}

integration/tests_failed/option_retry.html

@@ -4,4 +4,4 @@
 <span class="line"><span class="string">retry-interval</span><span>:</span> <span class="number">0</span></span>
 <span class="line"><span class="string">retry-max-count</span><span>:</span> <span class="number">2</span></span>
 </span><span class="response"><span class="line"><span class="version">HTTP/*</span> <span class="number">200</span></span>
-</span></span></code></pre>
+</span></span></code></pre>

integration/tests_failed/option_retry.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/not-found"},"response":{"status":200}}]}

integration/tests_failed/output_decompress.html

@@ -5,4 +5,4 @@
 <span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/error-output-decompress</span></span>
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 </span></span><span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/output_decompress.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-output-decompress"},"response":{"version":"HTTP/1.0","status":200}}]}

integration/tests_failed/predicate.html

@@ -14,4 +14,5 @@
 <span class="line"><span class="query-type">jsonpath</span> <span class="string">"$.message"</span> <span class="subquery-type">count</span> <span class="predicate-type">==</span> <span class="number">1</span></span>
 <span class="line"><span class="query-type">jsonpath</span> <span class="string">"$.toto"</span> <span class="predicate-type">exists</span></span>
 <span class="line"><span class="query-type">jsonpath</span> <span class="string">"$.message"</span> <span class="not">not</span> <span class="predicate-type">exists</span></span>
-<span class="line"><span class="query-type">jsonpath</span> <span class="string">"$.list"</span> <span class="subquery-type">count</span> <span class="predicate-type">==</span> <span class="number">2</span></span></span></span></code></pre>
+<span class="line"><span class="query-type">jsonpath</span> <span class="string">"$.list"</span> <span class="subquery-type">count</span> <span class="predicate-type">==</span> <span class="number">2</span></span>
+</span></span></code></pre>

integration/tests_failed/predicate.hurl

@@ -14,4 +14,4 @@ jsonpath "$.message" matches "hi"
 jsonpath "$.message" count == 1
 jsonpath "$.toto" exists
 jsonpath "$.message" not exists
-jsonpath "$.list" count == 2
+jsonpath "$.list" count == 2

integration/tests_failed/predicate.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/predicate/error/type"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"jsonpath","expr":"$.status"},"predicate":{"type":"equal","value":"true"}},{"query":{"type":"jsonpath","expr":"$.count"},"predicate":{"type":"equal","value":0}},{"query":{"type":"jsonpath","expr":"$.message"},"predicate":{"type":"equal","value":0}},{"query":{"type":"jsonpath","expr":"$.empty"},"predicate":{"type":"equal","value":0}},{"query":{"type":"jsonpath","expr":"$.number"},"predicate":{"type":"equal","value":1.1}},{"query":{"type":"jsonpath","expr":"$.message"},"predicate":{"type":"start-with","value":"hi"}},{"query":{"type":"jsonpath","expr":"$.message"},"predicate":{"type":"end-with","value":"hi"}},{"query":{"type":"jsonpath","expr":"$.message"},"predicate":{"type":"contain","value":"hi"}},{"query":{"type":"jsonpath","expr":"$.message"},"predicate":{"type":"match","value":"hi"}},{"query":{"type":"jsonpath","expr":"$.message","subquery":{"type":"count"}},"predicate":{"type":"equal","value":1}},{"query":{"type":"jsonpath","expr":"$.toto"},"predicate":{"type":"exist"}},{"query":{"type":"jsonpath","expr":"$.message"},"predicate":{"not":true,"type":"exist"}},{"query":{"type":"jsonpath","expr":"$.list","subquery":{"type":"count"}},"predicate":{"type":"equal","value":2}}]}}]}

integration/tests_failed/query_header_not_found.html

@@ -2,4 +2,4 @@
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 <span class="line"><span class="string">Custom</span><span>:</span> <span class="string">XXX</span></span>
 </span></span><span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/query_header_not_found.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-query-header-not-found"},"response":{"version":"HTTP/1.0","status":200,"headers":[{"name":"Custom","value":"XXX"}]}}]}

integration/tests_failed/query_invalid_json.html

@@ -3,4 +3,4 @@
 <span class="line section-header">[Asserts]</span>
 <span class="line"><span class="query-type">jsonpath</span> <span class="string">"$.errors"</span> <span class="subquery-type">count</span> <span class="predicate-type">==</span> <span class="number">2</span></span>
 </span></span><span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/query_invalid_json.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-query-invalid-json"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"jsonpath","expr":"$.errors","subquery":{"type":"count"}},"predicate":{"type":"equal","value":2}}]}}]}

integration/tests_failed/query_invalid_utf8.html

@@ -3,4 +3,4 @@
 <span class="line section-header">[Asserts]</span>
 <span class="line"><span class="query-type">jsonpath</span> <span class="string">"$.errors"</span> <span class="subquery-type">count</span> <span class="predicate-type">==</span> <span class="number">2</span></span>
 </span></span><span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/query_invalid_utf8.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/error-query-invalid-utf8"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"jsonpath","expr":"$.errors","subquery":{"type":"count"}},"predicate":{"type":"equal","value":2}}]}}]}

integration/tests_failed/query_match_none.html

@@ -4,4 +4,4 @@
 <span class="line"><span class="query-type">header</span> <span class="string">"Location"</span> <span class="predicate-type">matches</span> <span class="regex">/^foo$/</span></span>
 </span></span><span class="line"></span>
 <span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/query_match_none.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/query-match-none"},"response":{"asserts":[{"query":{"type":"header","name":"Location"},"predicate":{"type":"match","value":"^foo$","encoding":"regex"}}]}}]}

integration/tests_failed/retry.html

@@ -1,2 +1,3 @@
 <pre><code class="language-hurl"><span class="hurl-entry"><span class="request"><span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/not-found</span></span>
-</span><span class="response"><span class="line"><span class="version">HTTP/*</span> <span class="number">200</span></span></span></span></code></pre>
+</span><span class="response"><span class="line"><span class="version">HTTP/*</span> <span class="number">200</span></span>
+</span></span></code></pre>

integration/tests_failed/retry.hurl

@@ -1,2 +1,2 @@
 GET http://localhost:8000/not-found
-HTTP/* 200
+HTTP/* 200

integration/tests_failed/retry.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/not-found"},"response":{"status":200}}]}

integration/tests_failed/template_variable_not_found.html

@@ -1,3 +1,3 @@
 <pre><code class="language-hurl"><span class="hurl-entry"><span class="request"><span class="line"><span class="method">GET</span> <span class="url">{{url}}</span></span>
 </span></span><span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/template_variable_not_found.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"{{url}}"}}]}

integration/tests_failed/template_variable_not_renderable.html

@@ -8,4 +8,4 @@
 <span class="line"><span class="string">param1</span><span>:</span> <span class="string">{{list}}</span></span>
 </span><span class="response"><span class="line"><span class="version">HTTP/1.1</span> <span class="number">200</span></span>
 </span></span><span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/template_variable_not_renderable.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/get-list"},"response":{"version":"HTTP/1.0","status":200,"captures":[{"name":"list","query":{"type":"jsonpath","expr":"$.values"}}]}},{"request":{"method":"GET","url":"http://localhost:8000/undefined","query_string_params":[{"name":"param1","value":"{{list}}"}]},"response":{"version":"HTTP/1.1","status":200}}]}

integration/tests_failed/timeout.html

@@ -1,4 +1,4 @@
 <pre><code class="language-hurl"><span class="hurl-entry"><span class="request"><span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/timeout</span></span>
 </span></span><span class="line"></span>
 <span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_failed/timeout.json

@@ -0,0 +1 @@
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/timeout"}}]}

integration/tests_ok/assert_base64.html

@@ -9,4 +9,4 @@
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 <span class="line">base64,<span class="base64">bGluZTEKbGluZTINCmxpbmUzCg==</span>;</span>
 </span></span><span class="line"></span>
-</code></pre>
+</code></pre>

integration/tests_ok/assert_base64.json

@@ -1 +1 @@
-{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/assert-base64"},"response":{"version":"HTTP/1.0","status":200,"body":{"encoding":"base64","value":"bGluZTEKbGluZTINCmxpbmUzCg=="}}}]}
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/assert-base64"},"response":{"version":"HTTP/1.0","status":200,"body":{"encoding":"base64","value":"bGluZTEKbGluZTINCmxpbmUzCg=="}}}]}

integration/tests_ok/assert_header.html

@@ -11,4 +11,5 @@
 <span class="line"><span class="query-type">header</span> <span class="string">"Set-Cookie"</span> <span class="predicate-type">exists</span></span>
 <span class="line"><span class="query-type">header</span> <span class="string">"Set-Cookie"</span> <span class="subquery-type">count</span> <span class="predicate-type">==</span> <span class="number">3</span></span>
 <span class="line"><span class="query-type">header</span> <span class="string">"Set-Cookie"</span> <span class="predicate-type">includes</span> <span class="string">"cookie1=value1; Path=/"</span></span>
-<span class="line"><span class="query-type">header</span> <span class="string">"Set-Cookie"</span> <span class="not">not</span> <span class="predicate-type">includes</span> <span class="string">"cookie4=value4; Path=/"</span></span></span></span></code></pre>
+<span class="line"><span class="query-type">header</span> <span class="string">"Set-Cookie"</span> <span class="not">not</span> <span class="predicate-type">includes</span> <span class="string">"cookie4=value4; Path=/"</span></span>
+</span></span></code></pre>

integration/tests_ok/assert_header.hurl

@@ -11,4 +11,4 @@ header "ETag" == "\"33a64df551425fcc55e4d42a148795d9f25f89d4\""
 header "Set-Cookie" exists
 header "Set-Cookie" count == 3
 header "Set-Cookie" includes "cookie1=value1; Path=/"
-header "Set-Cookie" not includes "cookie4=value4; Path=/"
+header "Set-Cookie" not includes "cookie4=value4; Path=/"

integration/tests_ok/assert_header.json

@@ -1 +1 @@
-{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/assert-header"},"response":{"version":"HTTP/1.0","status":200,"headers":[{"name":"Content-Type","value":"text/html; charset=utf-8"},{"name":"Set-Cookie","value":"cookie1=value1; Path=/"},{"name":"Set-Cookie","value":"cookie2=value2; Path=/"}],"asserts":[{"query":{"type":"header","name":"Custom"},"predicate":{"not":true,"type":"exist"}},{"query":{"type":"header","name":"Content-Type"},"predicate":{"type":"exist"}},{"query":{"type":"header","name":"Header1"},"predicate":{"type":"equal","value":"value1"}},{"query":{"type":"header","name":"ETag"},"predicate":{"type":"equal","value":"\"33a64df551425fcc55e4d42a148795d9f25f89d4\""}},{"query":{"type":"header","name":"Set-Cookie"},"predicate":{"type":"exist"}},{"query":{"type":"header","name":"Set-Cookie","subquery":{"type":"count"}},"predicate":{"type":"equal","value":3}},{"query":{"type":"header","name":"Set-Cookie"},"predicate":{"type":"include","value":"cookie1=value1; Path=/"}},{"query":{"type":"header","name":"Set-Cookie"},"predicate":{"not":true,"type":"include","value":"cookie4=value4; Path=/"}}]}}]}
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/assert-header"},"response":{"version":"HTTP/1.0","status":200,"headers":[{"name":"Content-Type","value":"text/html; charset=utf-8"},{"name":"Set-Cookie","value":"cookie1=value1; Path=/"},{"name":"Set-Cookie","value":"cookie2=value2; Path=/"}],"asserts":[{"query":{"type":"header","name":"Custom"},"predicate":{"not":true,"type":"exist"}},{"query":{"type":"header","name":"Content-Type"},"predicate":{"type":"exist"}},{"query":{"type":"header","name":"Header1"},"predicate":{"type":"equal","value":"value1"}},{"query":{"type":"header","name":"ETag"},"predicate":{"type":"equal","value":"\"33a64df551425fcc55e4d42a148795d9f25f89d4\""}},{"query":{"type":"header","name":"Set-Cookie"},"predicate":{"type":"exist"}},{"query":{"type":"header","name":"Set-Cookie","subquery":{"type":"count"}},"predicate":{"type":"equal","value":3}},{"query":{"type":"header","name":"Set-Cookie"},"predicate":{"type":"include","value":"cookie1=value1; Path=/"}},{"query":{"type":"header","name":"Set-Cookie"},"predicate":{"not":true,"type":"include","value":"cookie4=value4; Path=/"}}]}}]}

integration/tests_ok/assert_json.html

@@ -89,4 +89,5 @@
 <span class="line"><span class="method">GET</span> <span class="url">http://localhost:8000/assert-json/filter</span></span>
 </span><span class="response"><span class="line"><span class="version">HTTP/1.0</span> <span class="number">200</span></span>
 <span class="line section-header">[Asserts]</span>
-<span class="line"><span class="query-type">jsonpath</span> <span class="string">"$.fruit[?(@.price.US==200)].name"</span> <span class="predicate-type">equals</span> <span class="string">"grape"</span></span></span></span></code></pre>
+<span class="line"><span class="query-type">jsonpath</span> <span class="string">"$.fruit[?(@.price.US==200)].name"</span> <span class="predicate-type">equals</span> <span class="string">"grape"</span></span>
+</span></span></code></pre>

integration/tests_ok/assert_json.hurl

@@ -89,4 +89,4 @@ jsonpath "$[0].name" == "Bob"
 GET http://localhost:8000/assert-json/filter
 HTTP/1.0 200
 [Asserts]
-jsonpath "$.fruit[?(@.price.US==200)].name" equals "grape"
+jsonpath "$.fruit[?(@.price.US==200)].name" equals "grape"

integration/tests_ok/assert_match.html

@@ -7,4 +7,5 @@
 <span class="line"><span class="query-type">jsonpath</span> <span class="string">"$.date1"</span> <span class="predicate-type">matches</span> <span class="regex">/^\d{4}-\d{2}-\d{2}$/</span></span>
 <span class="line"><span class="query-type">jsonpath</span> <span class="string">"$.date2"</span> <span class="not">not</span> <span class="predicate-type">matches</span> <span class="regex">/^\d{4}-\d{2}-\d{2}$/</span></span>
 <span class="line"><span class="query-type">jsonpath</span> <span class="string">"$.path1"</span> <span class="predicate-type">matches</span> <span class="regex">/aa\/bb/</span></span>
-<span class="line"><span class="query-type">jsonpath</span> <span class="string">"$.path2"</span> <span class="predicate-type">matches</span> <span class="regex">/aa\\bb/</span></span></span></span></code></pre>
+<span class="line"><span class="query-type">jsonpath</span> <span class="string">"$.path2"</span> <span class="predicate-type">matches</span> <span class="regex">/aa\\bb/</span></span>
+</span></span></code></pre>

integration/tests_ok/assert_match.hurl

@@ -7,4 +7,4 @@ jsonpath "$.date2" matches /\d{4}-\d{2}-\d{2}/
 jsonpath "$.date1" matches /^\d{4}-\d{2}-\d{2}$/
 jsonpath "$.date2" not matches /^\d{4}-\d{2}-\d{2}$/
 jsonpath "$.path1" matches /aa\/bb/
-jsonpath "$.path2" matches /aa\\bb/
+jsonpath "$.path2" matches /aa\\bb/

integration/tests_ok/assert_match.json

@@ -1 +1 @@
-{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/assert-match"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"jsonpath","expr":"$.date1"},"predicate":{"type":"match","value":"\\d{4}-\\d{2}-\\d{2}"}},{"query":{"type":"jsonpath","expr":"$.date1"},"predicate":{"type":"match","value":"\\d{4}-\\d{2}-\\d{2}","encoding":"regex"}},{"query":{"type":"jsonpath","expr":"$.date2"},"predicate":{"type":"match","value":"\\d{4}-\\d{2}-\\d{2}","encoding":"regex"}},{"query":{"type":"jsonpath","expr":"$.date1"},"predicate":{"type":"match","value":"^\\d{4}-\\d{2}-\\d{2}$","encoding":"regex"}},{"query":{"type":"jsonpath","expr":"$.date2"},"predicate":{"not":true,"type":"match","value":"^\\d{4}-\\d{2}-\\d{2}$","encoding":"regex"}},{"query":{"type":"jsonpath","expr":"$.path1"},"predicate":{"type":"match","value":"aa/bb","encoding":"regex"}},{"query":{"type":"jsonpath","expr":"$.path2"},"predicate":{"type":"match","value":"aa\\\\bb","encoding":"regex"}}]}}]}
+{"entries":[{"request":{"method":"GET","url":"http://localhost:8000/assert-match"},"response":{"version":"HTTP/1.0","status":200,"asserts":[{"query":{"type":"jsonpath","expr":"$.date1"},"predicate":{"type":"match","value":"\\d{4}-\\d{2}-\\d{2}"}},{"query":{"type":"jsonpath","expr":"$.date1"},"predicate":{"type":"match","value":"\\d{4}-\\d{2}-\\d{2}","encoding":"regex"}},{"query":{"type":"jsonpath","expr":"$.date2"},"predicate":{"type":"match","value":"\\d{4}-\\d{2}-\\d{2}","encoding":"regex"}},{"query":{"type":"jsonpath","expr":"$.date1"},"predicate":{"type":"match","value":"^\\d{4}-\\d{2}-\\d{2}$","encoding":"regex"}},{"query":{"type":"jsonpath","expr":"$.date2"},"predicate":{"not":true,"type":"match","value":"^\\d{4}-\\d{2}-\\d{2}$","encoding":"regex"}},{"query":{"type":"jsonpath","expr":"$.path1"},"predicate":{"type":"match","value":"aa/bb","encoding":"regex"}},{"query":{"type":"jsonpath","expr":"$.path2"},"predicate":{"type":"match","value":"aa\\\\bb","encoding":"regex"}}]}}]}