From 00e23a4c57110c50b579c063b7afb815f61724cb Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 8 Nov 2016 14:42:04 +0100 Subject: [PATCH] Rewrite test_redirected_request_to_devtools. --- tests/unit/net/http_loader.rs | 56 +++++++++++++++++------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs index 8a9880d70f1..47ac4acfc27 100644 --- a/tests/unit/net/http_loader.rs +++ b/tests/unit/net/http_loader.rs @@ -575,47 +575,47 @@ fn test_request_and_response_message_from_devtool_without_pipeline_id() { #[test] fn test_redirected_request_to_devtools() { - struct Factory; + let post_handler = move |request: HyperRequest, response: HyperResponse| { + assert_eq!(request.method, Method::Get); + response.send(b"Yay!").unwrap(); + }; + let (mut post_server, post_url) = make_server(post_handler); - impl HttpRequestFactory for Factory { - type R = MockRequest; + let post_redirect_url = post_url.clone(); + let pre_handler = move |request: HyperRequest, mut response: HyperResponse| { + assert_eq!(request.method, Method::Post); + response.headers_mut().set(Location(post_redirect_url.to_string())); + *response.status_mut() = StatusCode::MovedPermanently; + response.send(b"").unwrap(); + }; + let (mut pre_server, pre_url) = make_server(pre_handler); - fn create(&self, url: Url, method: Method, _: Headers) -> Result { - if url.domain().unwrap() == "mozilla.com" { - assert_eq!(Method::Post, method); - Ok(MockRequest::new(ResponseType::Redirect("http://mozilla.org".to_owned()))) - } else { - assert_eq!(Method::Get, method); - Ok(MockRequest::new(ResponseType::Text(<[_]>::to_vec("Yay!".as_bytes())))) - } - } - } + let request = Request::from_init(RequestInit { + url: pre_url.clone(), + method: Method::Post, + destination: Destination::Document, + origin: pre_url.clone(), + pipeline_id: Some(TEST_PIPELINE_ID), + .. RequestInit::default() + }); + let (devtools_chan, devtools_port) = mpsc::channel(); + let response = fetch_sync(request, Some(devtools_chan)); - let url = Url::parse("http://mozilla.com").unwrap(); - let mut load_data = LoadData::new(LoadContext::Browsing, url.clone(), &HttpTest); - - load_data.method = Method::Post; - - let http_state = HttpState::new(); - let ui_provider = TestProvider::new(); - let (devtools_chan, devtools_port) = mpsc::channel::(); - - let _ = load(&load_data, &ui_provider, &http_state, Some(devtools_chan), &Factory, - DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); + let _ = pre_server.close(); + let _ = post_server.close(); let devhttprequest = expect_devtools_http_request(&devtools_port); let devhttpresponse = expect_devtools_http_response(&devtools_port); assert!(devhttprequest.method == Method::Post); - assert!(devhttprequest.url == url); - assert!(devhttpresponse.status == Some((301, "Moved Permanently".as_bytes().to_vec()))); + assert!(devhttprequest.url == pre_url); + assert!(devhttpresponse.status == Some((301, b"Moved Permanently".to_vec()))); let devhttprequest = expect_devtools_http_request(&devtools_port); let devhttpresponse = expect_devtools_http_response(&devtools_port); - let url = Url::parse("http://mozilla.org").unwrap(); assert!(devhttprequest.method == Method::Get); - assert!(devhttprequest.url == url); + assert!(devhttprequest.url == post_url); assert!(devhttpresponse.status == Some((200, b"OK".to_vec()))); }