From 9cf35986eb3c63d55c85bceb13718b3aca20867c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Mon, 22 Apr 2019 13:55:17 +0200
Subject: Add origin_scheme checks to tests

---
 src/gun.erl            |  1 -
 test/rfc7231_SUITE.erl | 26 ++++++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/gun.erl b/src/gun.erl
index e86d73e..d209450 100644
--- a/src/gun.erl
+++ b/src/gun.erl
@@ -308,7 +308,6 @@ info(ServerPid) ->
 		protocol => Protocol:name(),
 		sock_ip => SockIP,
 		sock_port => SockPort,
-		%% @todo Add origin_scheme to documentation/tests.
 		origin_scheme => OriginScheme,
 		origin_host => OriginHost,
 		origin_port => OriginPort,
diff --git a/test/rfc7231_SUITE.erl b/test/rfc7231_SUITE.erl
index c9bd3b4..f67b7ed 100644
--- a/test/rfc7231_SUITE.erl
+++ b/test/rfc7231_SUITE.erl
@@ -125,24 +125,24 @@ do_proxy_loop(Transport, ClientSocket, OriginSocket) ->
 connect_http(_) ->
 	doc("CONNECT can be used to establish a TCP connection "
 		"to an HTTP/1.1 server via an HTTP proxy. (RFC7231 4.3.6)"),
-	do_connect_http(tcp, tcp).
+	do_connect_http(<<"http">>, tcp, tcp).
 
 connect_https(_) ->
 	doc("CONNECT can be used to establish a TLS connection "
 		"to an HTTP/1.1 server via an HTTP proxy. (RFC7231 4.3.6)"),
-	do_connect_http(tls, tcp).
+	do_connect_http(<<"https">>, tls, tcp).
 
 connect_http_over_https_proxy(_) ->
 	doc("CONNECT can be used to establish a TCP connection "
 		"to an HTTP/1.1 server via an HTTPS proxy. (RFC7231 4.3.6)"),
-	do_connect_http(tcp, tls).
+	do_connect_http(<<"http">>, tcp, tls).
 
 connect_https_over_https_proxy(_) ->
 	doc("CONNECT can be used to establish a TLS connection "
 		"to an HTTP/1.1 server via an HTTPS proxy. (RFC7231 4.3.6)"),
-	do_connect_http(tls, tls).
+	do_connect_http(<<"https">>, tls, tls).
 
-do_connect_http(OriginTransport, ProxyTransport) ->
+do_connect_http(OriginScheme, OriginTransport, ProxyTransport) ->
 	{ok, OriginPid, OriginPort} = init_origin(OriginTransport, http),
 	{ok, ProxyPid, ProxyPort} = do_proxy_start(ProxyTransport),
 	Authority = iolist_to_binary(["localhost:", integer_to_binary(OriginPort)]),
@@ -162,6 +162,7 @@ do_connect_http(OriginTransport, ProxyTransport) ->
 	#{
 		transport := OriginTransport,
 		protocol := http,
+		origin_scheme := OriginScheme,
 		origin_host := "localhost",
 		origin_port := OriginPort,
 		intermediaries := [#{
@@ -176,24 +177,24 @@ do_connect_http(OriginTransport, ProxyTransport) ->
 connect_h2c(_) ->
 	doc("CONNECT can be used to establish a TCP connection "
 		"to an HTTP/2 server via an HTTP proxy. (RFC7231 4.3.6)"),
-	do_connect_h2(tcp, tcp).
+	do_connect_h2(<<"http">>, tcp, tcp).
 
 connect_h2(_) ->
 	doc("CONNECT can be used to establish a TLS connection "
 		"to an HTTP/2 server via an HTTP proxy. (RFC7231 4.3.6)"),
-	do_connect_h2(tls, tcp).
+	do_connect_h2(<<"https">>, tls, tcp).
 
 connect_h2c_over_https_proxy(_) ->
 	doc("CONNECT can be used to establish a TCP connection "
 		"to an HTTP/2 server via an HTTPS proxy. (RFC7231 4.3.6)"),
-	do_connect_h2(tcp, tls).
+	do_connect_h2(<<"http">>, tcp, tls).
 
 connect_h2_over_https_proxy(_) ->
 	doc("CONNECT can be used to establish a TLS connection "
 		"to an HTTP/2 server via an HTTPS proxy. (RFC7231 4.3.6)"),
-	do_connect_h2(tls, tls).
+	do_connect_h2(<<"https">>, tls, tls).
 
-do_connect_h2(OriginTransport, ProxyTransport) ->
+do_connect_h2(OriginScheme, OriginTransport, ProxyTransport) ->
 	{ok, OriginPid, OriginPort} = init_origin(OriginTransport, http2),
 	{ok, ProxyPid, ProxyPort} = do_proxy_start(ProxyTransport),
 	Authority = iolist_to_binary(["localhost:", integer_to_binary(OriginPort)]),
@@ -213,6 +214,7 @@ do_connect_h2(OriginTransport, ProxyTransport) ->
 	#{
 		transport := OriginTransport,
 		protocol := http2,
+		origin_scheme := OriginScheme,
 		origin_host := "localhost",
 		origin_port := OriginPort,
 		intermediaries := [#{
@@ -254,6 +256,7 @@ connect_through_multiple_proxies(_) ->
 	#{
 		transport := tcp,
 		protocol := http,
+		origin_scheme := <<"http">>,
 		origin_host := "localhost",
 		origin_port := OriginPort,
 		intermediaries := [#{
@@ -292,6 +295,7 @@ connect_delay(_) ->
 	#{
 		transport := tcp,
 		protocol := http,
+		origin_scheme := <<"http">>,
 		origin_host := "localhost",
 		origin_port := OriginPort,
 		intermediaries := [#{
@@ -324,6 +328,7 @@ connect_response_201(_) ->
 	#{
 		transport := tcp,
 		protocol := http,
+		origin_scheme := <<"http">>,
 		origin_host := "localhost",
 		origin_port := OriginPort,
 		intermediaries := [#{
@@ -368,6 +373,7 @@ do_connect_failure(Status) ->
 	#{
 		transport := tcp,
 		protocol := http,
+		origin_scheme := <<"http">>,
 		origin_host := "localhost",
 		origin_port := ProxyPort,
 		intermediaries := []
-- 
cgit v1.2.3