Rewrite test_redirected_request_to_devtools.

This commit is contained in:
Ms2ger 2016-11-08 14:42:04 +01:00
parent 9b1e153b31
commit 00e23a4c57

View file

@ -575,47 +575,47 @@ fn test_request_and_response_message_from_devtool_without_pipeline_id() {
#[test] #[test]
fn test_redirected_request_to_devtools() { 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 { let post_redirect_url = post_url.clone();
type R = MockRequest; 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<MockRequest, LoadError> { let request = Request::from_init(RequestInit {
if url.domain().unwrap() == "mozilla.com" { url: pre_url.clone(),
assert_eq!(Method::Post, method); method: Method::Post,
Ok(MockRequest::new(ResponseType::Redirect("http://mozilla.org".to_owned()))) destination: Destination::Document,
} else { origin: pre_url.clone(),
assert_eq!(Method::Get, method); pipeline_id: Some(TEST_PIPELINE_ID),
Ok(MockRequest::new(ResponseType::Text(<[_]>::to_vec("Yay!".as_bytes())))) .. 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 _ = pre_server.close();
let mut load_data = LoadData::new(LoadContext::Browsing, url.clone(), &HttpTest); let _ = post_server.close();
load_data.method = Method::Post;
let http_state = HttpState::new();
let ui_provider = TestProvider::new();
let (devtools_chan, devtools_port) = mpsc::channel::<DevtoolsControlMsg>();
let _ = load(&load_data, &ui_provider, &http_state, Some(devtools_chan), &Factory,
DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None);
let devhttprequest = expect_devtools_http_request(&devtools_port); let devhttprequest = expect_devtools_http_request(&devtools_port);
let devhttpresponse = expect_devtools_http_response(&devtools_port); let devhttpresponse = expect_devtools_http_response(&devtools_port);
assert!(devhttprequest.method == Method::Post); assert!(devhttprequest.method == Method::Post);
assert!(devhttprequest.url == url); assert!(devhttprequest.url == pre_url);
assert!(devhttpresponse.status == Some((301, "Moved Permanently".as_bytes().to_vec()))); assert!(devhttpresponse.status == Some((301, b"Moved Permanently".to_vec())));
let devhttprequest = expect_devtools_http_request(&devtools_port); let devhttprequest = expect_devtools_http_request(&devtools_port);
let devhttpresponse = expect_devtools_http_response(&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.method == Method::Get);
assert!(devhttprequest.url == url); assert!(devhttprequest.url == post_url);
assert!(devhttpresponse.status == Some((200, b"OK".to_vec()))); assert!(devhttpresponse.status == Some((200, b"OK".to_vec())));
} }