Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rewrite test_load_doesnt_send_request_body_on_any_redirect.

Browse source 
Note that it is necessary to use POST here; using GET will cause an error in
hyper, which enforces the rule that GET requests don't have a body.
This commit is contained in:
Ms2ger 2016-11-08 17:37:59 +01:00
parent ba86d8576d
commit f03a6001de
1 changed files with 29 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

85
tests/unit/net/http_loader.rs
View file

@ -309,27 +309,6 @@ impl HttpRequestFactory for AssertMustNotIncludeHeadersRequestFactory {
} }
} }
struct AssertMustHaveBodyRequest {
expected_body: Option<Vec<u8>>,
t: ResponseType
}
impl AssertMustHaveBodyRequest {
fn new(t: ResponseType, expected_body: Option<Vec<u8>>) -> Self {
AssertMustHaveBodyRequest { expected_body: expected_body, t: t }
}
}
impl HttpRequest for AssertMustHaveBodyRequest {
type R = MockResponse;
fn send(self, body: &Option<Vec<u8>>) -> Result<MockResponse, LoadError> {
assert_eq!(self.expected_body, *body);
response_for_request_type(self.t)
}
}
pub fn expect_devtools_http_request(devtools_port: &Receiver<DevtoolsControlMsg>) -> DevtoolsHttpRequest { pub fn expect_devtools_http_request(devtools_port: &Receiver<DevtoolsControlMsg>) -> DevtoolsHttpRequest {
match devtools_port.recv().unwrap() { match devtools_port.recv().unwrap() {
DevtoolsControlMsg::FromChrome( DevtoolsControlMsg::FromChrome(
@ -715,45 +694,39 @@ fn test_load_should_decode_the_response_as_gzip_when_response_headers_have_conte
#[test] #[test]
fn test_load_doesnt_send_request_body_on_any_redirect() { fn test_load_doesnt_send_request_body_on_any_redirect() {
struct Factory; let post_handler = move |mut request: HyperRequest, response: HyperResponse| {
assert_eq!(request.method, Method::Get);
let data = read_response(&mut request);
assert_eq!(data, "");
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 = AssertMustHaveBodyRequest; let pre_handler = move |mut request: HyperRequest, mut response: HyperResponse| {
let data = read_response(&mut request);
assert_eq!(data, "Body on 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, _: Headers) -> Result<AssertMustHaveBodyRequest, LoadError> { let request = Request::from_init(RequestInit {
if url.domain().unwrap() == "mozilla.com" { url: pre_url.clone(),
Ok( body: Some(b"Body on POST!".to_vec()),
AssertMustHaveBodyRequest::new( method: Method::Post,
ResponseType::Redirect("http://mozilla.org".to_owned()), destination: Destination::Document,
Some(<[_]>::to_vec("Body on POST!".as_bytes())) origin: pre_url.clone(),
) pipeline_id: Some(TEST_PIPELINE_ID),
) .. RequestInit::default()
} else { });
Ok( let response = fetch_sync(request, None);
AssertMustHaveBodyRequest::new(
ResponseType::Text(<[_]>::to_vec("Yay!".as_bytes())),
None
)
)
}
}
}
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.data = Some(<[_]>::to_vec("Body on POST!".as_bytes())); assert!(response.to_actual().status.unwrap().is_success());
let http_state = HttpState::new();
let ui_provider = TestProvider::new();
let _ = load(
&load_data, &ui_provider, &http_state,
None,
&Factory,
DEFAULT_USER_AGENT.into(),
&CancellationListener::new(None),
None);
} }
#[test] #[test]