From 2d9aea8db021a1ab3f477e6e0f78a73c8892b653 Mon Sep 17 00:00:00 2001
From: Sean McArthur <sean.monstar@gmail.com>
Date: Mon, 23 May 2016 11:19:43 -0700
Subject: [PATCH] fix(client): send query parameters in Requests

---
 src/client/mod.rs |   3 +-
 tests/client.rs   | 103 +++++++++++++++++++++++++++++++++++-----------
 2 files changed, 82 insertions(+), 24 deletions(-)

diff --git a/src/client/mod.rs b/src/client/mod.rs
index e29f5cd701..8502e6fd03 100644
--- a/src/client/mod.rs
+++ b/src/client/mod.rs
@@ -293,6 +293,7 @@ impl<H: Handler<T>, T: Transport> http::MessageHandler<T> for Message<H, T> {
     type Message = http::ClientMessage;
 
     fn on_outgoing(&mut self, head: &mut RequestHead) -> Next {
+        use ::url::Position;
         let url = self.url.take().expect("Message.url is missing");
         if let Some(host) = url.host_str() {
             head.headers.set(Host {
@@ -300,7 +301,7 @@ impl<H: Handler<T>, T: Transport> http::MessageHandler<T> for Message<H, T> {
                 port: url.port(),
             });
         }
-        head.subject.1 = RequestUri::AbsolutePath(url.path().to_owned());
+        head.subject.1 = RequestUri::AbsolutePath(url[Position::BeforePath..Position::AfterQuery].to_owned());
         let mut req = self::request::new(head);
         self.handler.on_request(&mut req)
     }
diff --git a/tests/client.rs b/tests/client.rs
index c2c8271190..0c34ee07cb 100644
--- a/tests/client.rs
+++ b/tests/client.rs
@@ -7,7 +7,6 @@ use std::sync::mpsc;
 use std::time::Duration;
 
 use hyper::client::{Handler, Request, Response, HttpConnector};
-use hyper::header;
 use hyper::{Method, StatusCode, Next, Encoder, Decoder};
 use hyper::net::HttpStream;
 
@@ -158,33 +157,91 @@ fn client() -> Client {
     }
 }
 
+macro_rules! test {
+    (
+        name: $name:ident,
+        server:
+            expected: $server_expected:expr,
+            reply: $server_reply:expr,
+        client:
+            request:
+                method: $client_method:ident,
+                url: $client_url:expr,
+            response:
+                status: $client_status:ident,
+                headers: [ $($client_headers:expr,)* ],
+                body: $client_body:expr
+    ) => (
+        #[test]
+        fn $name() {
+            let server = TcpListener::bind("127.0.0.1:0").unwrap();
+            let addr = server.local_addr().unwrap();
+            let client = client();
+            let res = client.request(format!($client_url, addr=addr), opts().method(Method::$client_method));
 
-#[test]
-fn client_get() {
-    let server = TcpListener::bind("127.0.0.1:0").unwrap();
-    let addr = server.local_addr().unwrap();
-    let client = client();
-    let res = client.request(format!("http://{}/", addr), opts().method(Method::Get));
+            let mut inc = server.accept().unwrap().0;
+            inc.set_read_timeout(Some(Duration::from_secs(5))).unwrap();
+            inc.set_write_timeout(Some(Duration::from_secs(5))).unwrap();
+            let mut buf = [0; 4096];
+            let n = inc.read(&mut buf).unwrap();
+            let expected = format!($server_expected, addr=addr);
+            assert_eq!(s(&buf[..n]), expected);
 
-    let mut inc = server.accept().unwrap().0;
-    inc.set_read_timeout(Some(Duration::from_secs(5))).unwrap();
-    inc.set_write_timeout(Some(Duration::from_secs(5))).unwrap();
-    let mut buf = [0; 4096];
-    let n = inc.read(&mut buf).unwrap();
-    let expected = format!("GET / HTTP/1.1\r\nHost: {}\r\n\r\n", addr);
-    assert_eq!(s(&buf[..n]), expected);
+            inc.write_all($server_reply.as_ref()).unwrap();
 
-    inc.write_all(b"HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n").unwrap();
+            if let Msg::Head(head) = res.recv().unwrap() {
+                use hyper::header::*;
+                assert_eq!(head.status(), &StatusCode::$client_status);
+                $(
+                    assert_eq!(head.headers().get(), Some(&$client_headers));
+                )*
+            } else {
+                panic!("we lost the head!");
+            }
+            //drop(inc);
 
-    if let Msg::Head(head) = res.recv().unwrap() {
-        assert_eq!(head.status(), &StatusCode::Ok);
-        assert_eq!(head.headers().get(), Some(&header::ContentLength(0)));
-    } else {
-        panic!("we lost the head!");
-    }
-    //drop(inc);
+            assert!(res.recv().is_err());
+        }
+    );
+}
+
+test! {
+    name: client_get,
+
+    server:
+        expected: "GET / HTTP/1.1\r\nHost: {addr}\r\n\r\n",
+        reply: "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n",
+
+    client:
+        request:
+            method: Get,
+            url: "http://{addr}/",
+        response:
+            status: Ok,
+            headers: [
+                ContentLength(0),
+            ],
+            body: None
+}
+
+test! {
+    name: client_get_query,
+
+    server:
+        expected: "GET /foo?key=val HTTP/1.1\r\nHost: {addr}\r\n\r\n",
+        reply: "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n",
+
+    client:
+        request:
+            method: Get,
+            url: "http://{addr}/foo?key=val#dont_send_me",
+        response:
+            status: Ok,
+            headers: [
+                ContentLength(0),
+            ],
+            body: None
 
-    assert!(res.recv().is_err());
 }
 
 #[test]