From 5bf90c563ce54bde6ca595825731e3b64efd794b Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Wed, 9 Nov 2016 17:49:26 +0100 Subject: [PATCH 01/12] Rewrite test_load_sets_cookies_in_the_resource_manager_when_it_get_set_cookie_header_in_response. --- tests/unit/net/http_loader.rs | 48 ++++++++++++++++------------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs index 9508d36a8f5..b6ea03105e3 100644 --- a/tests/unit/net/http_loader.rs +++ b/tests/unit/net/http_loader.rs @@ -31,7 +31,7 @@ use net::test::{HttpRequest, HttpRequestFactory, HttpState, LoadError, UIProvide use net::test::{HttpResponse, LoadErrorType}; use net_traits::{CookieSource, IncludeSubdomains, LoadContext, LoadData}; use net_traits::{CustomResponse, LoadOrigin, Metadata, ReferrerPolicy}; -use net_traits::request::{Request, RequestInit, Destination}; +use net_traits::request::{Request, RequestInit, CredentialsMode, Destination}; use net_traits::response::ResponseBody; use new_fetch_context; use std::borrow::Cow; @@ -788,37 +788,33 @@ fn test_load_adds_host_to_sts_list_when_url_is_https_and_sts_headers_are_present #[test] fn test_load_sets_cookies_in_the_resource_manager_when_it_get_set_cookie_header_in_response() { - struct Factory; + let handler = move |_: HyperRequest, mut response: HyperResponse| { + response.headers_mut().set(SetCookie(vec![CookiePair::new("mozillaIs".to_owned(), "theBest".to_owned())])); + response.send(b"Yay!").unwrap(); + }; + let (mut server, url) = make_server(handler); - impl HttpRequestFactory for Factory { - type R = MockRequest; + let context = new_fetch_context(None); - fn create(&self, _: Url, _: Method, _: Headers) -> Result { - let content = <[_]>::to_vec("Yay!".as_bytes()); - let mut headers = Headers::new(); - headers.set(SetCookie(vec![CookiePair::new("mozillaIs".to_owned(), "theBest".to_owned())])); - Ok(MockRequest::new(ResponseType::WithHeaders(content, headers))) - } - } + assert_cookie_for_domain(context.state.cookie_jar.clone(), url.as_str(), None); - let url = Url::parse("http://mozilla.com").unwrap(); + let request = Request::from_init(RequestInit { + url: url.clone(), + method: Method::Get, + body: None, + destination: Destination::Document, + origin: url.clone(), + pipeline_id: Some(TEST_PIPELINE_ID), + credentials_mode: CredentialsMode::Include, + .. RequestInit::default() + }); + let response = fetch(Rc::new(request), &mut None, &context); - let http_state = HttpState::new(); - let ui_provider = TestProvider::new(); + let _ = server.close(); - assert_cookie_for_domain(http_state.cookie_jar.clone(), "http://mozilla.com", None); + assert!(response.status.unwrap().is_success()); - let load_data = LoadData::new(LoadContext::Browsing, url.clone(), &HttpTest); - - let _ = load(&load_data, - &ui_provider, &http_state, - None, - &Factory, - DEFAULT_USER_AGENT.into(), - &CancellationListener::new(None), - None); - - assert_cookie_for_domain(http_state.cookie_jar.clone(), "http://mozilla.com", Some("mozillaIs=theBest")); + assert_cookie_for_domain(context.state.cookie_jar.clone(), url.as_str(), Some("mozillaIs=theBest")); } #[test] From f1f090ca81431145404546f9c82fc13152573998 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 10 Nov 2016 09:57:14 +0100 Subject: [PATCH 02/12] Rewrite test_load_sets_requests_cookies_header_for_url_by_getting_cookies_from_the_resource_manager. --- tests/unit/net/http_loader.rs | 40 ++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs index b6ea03105e3..a9419e86b0d 100644 --- a/tests/unit/net/http_loader.rs +++ b/tests/unit/net/http_loader.rs @@ -819,34 +819,40 @@ fn test_load_sets_cookies_in_the_resource_manager_when_it_get_set_cookie_header_ #[test] fn test_load_sets_requests_cookies_header_for_url_by_getting_cookies_from_the_resource_manager() { - let url = Url::parse("http://mozilla.com").unwrap(); + let handler = move |request: HyperRequest, response: HyperResponse| { + assert_eq!(request.headers.get::(), + Some(&CookieHeader(vec![CookiePair::new("mozillaIs".to_owned(), "theBest".to_owned())]))); + response.send(b"Yay!").unwrap(); + }; + let (mut server, url) = make_server(handler); - let mut load_data = LoadData::new(LoadContext::Browsing, url.clone(), &HttpTest); - load_data.data = Some(<[_]>::to_vec("Yay!".as_bytes())); - - let http_state = HttpState::new(); - let ui_provider = TestProvider::new(); + let context = new_fetch_context(None); { - let mut cookie_jar = http_state.cookie_jar.write().unwrap(); - let cookie_url = url.clone(); + let mut cookie_jar = context.state.cookie_jar.write().unwrap(); let cookie = Cookie::new_wrapped( CookiePair::new("mozillaIs".to_owned(), "theBest".to_owned()), - &cookie_url, + &url, CookieSource::HTTP ).unwrap(); cookie_jar.push(cookie, CookieSource::HTTP); } - let mut cookie = Headers::new(); - cookie.set(CookieHeader(vec![CookiePair::new("mozillaIs".to_owned(), "theBest".to_owned())])); + let request = Request::from_init(RequestInit { + url: url.clone(), + method: Method::Get, + body: None, + destination: Destination::Document, + origin: url.clone(), + pipeline_id: Some(TEST_PIPELINE_ID), + credentials_mode: CredentialsMode::Include, + .. RequestInit::default() + }); + let response = fetch(Rc::new(request), &mut None, &context); - let _ = load(&load_data.clone(), &ui_provider, &http_state, None, - &AssertMustIncludeHeadersRequestFactory { - expected_headers: cookie, - body: <[_]>::to_vec(&*load_data.data.unwrap()) - }, DEFAULT_USER_AGENT.into(), - &CancellationListener::new(None), None); + let _ = server.close(); + + assert!(response.status.unwrap().is_success()); } #[test] From 52258e22825bee7df4fe35b37c66383e3274fe02 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 10 Nov 2016 10:08:11 +0100 Subject: [PATCH 03/12] Rewrite test_load_sends_cookie_if_nonhttp. --- tests/unit/net/http_loader.rs | 38 ++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs index a9419e86b0d..2d4924ca90a 100644 --- a/tests/unit/net/http_loader.rs +++ b/tests/unit/net/http_loader.rs @@ -899,34 +899,40 @@ fn test_load_sends_secure_cookie_if_http_changed_to_https_due_to_entry_in_hsts_s #[test] fn test_load_sends_cookie_if_nonhttp() { - let url = Url::parse("http://mozilla.com").unwrap(); + let handler = move |request: HyperRequest, response: HyperResponse| { + assert_eq!(request.headers.get::(), + Some(&CookieHeader(vec![CookiePair::new("mozillaIs".to_owned(), "theBest".to_owned())]))); + response.send(b"Yay!").unwrap(); + }; + let (mut server, url) = make_server(handler); - let http_state = HttpState::new(); - let ui_provider = TestProvider::new(); + let context = new_fetch_context(None); { - let mut cookie_jar = http_state.cookie_jar.write().unwrap(); - let cookie_url = url.clone(); + let mut cookie_jar = context.state.cookie_jar.write().unwrap(); let cookie = Cookie::new_wrapped( CookiePair::new("mozillaIs".to_owned(), "theBest".to_owned()), - &cookie_url, + &url, CookieSource::NonHTTP ).unwrap(); cookie_jar.push(cookie, CookieSource::HTTP); } - let mut load_data = LoadData::new(LoadContext::Browsing, url, &HttpTest); - load_data.data = Some(<[_]>::to_vec("Yay!".as_bytes())); + let request = Request::from_init(RequestInit { + url: url.clone(), + method: Method::Get, + body: None, + destination: Destination::Document, + origin: url.clone(), + pipeline_id: Some(TEST_PIPELINE_ID), + credentials_mode: CredentialsMode::Include, + .. RequestInit::default() + }); + let response = fetch(Rc::new(request), &mut None, &context); - let mut headers = Headers::new(); - headers.set_raw("Cookie".to_owned(), vec![<[_]>::to_vec("mozillaIs=theBest".as_bytes())]); + let _ = server.close(); - let _ = load( - &load_data.clone(), &ui_provider, &http_state, None, - &AssertMustIncludeHeadersRequestFactory { - expected_headers: headers, - body: <[_]>::to_vec(&*load_data.data.unwrap()) - }, DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None); + assert!(response.status.unwrap().is_success()); } #[test] From 982c59662cad4cef8feb31d7d69a8ee51d23e821 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 10 Nov 2016 10:16:01 +0100 Subject: [PATCH 04/12] Rewrite test_cookie_set_with_httponly_should_not_be_available_using_getcookiesforurl. --- tests/unit/net/http_loader.rs | 45 +++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs index 2d4924ca90a..154a19ca780 100644 --- a/tests/unit/net/http_loader.rs +++ b/tests/unit/net/http_loader.rs @@ -937,33 +937,36 @@ fn test_load_sends_cookie_if_nonhttp() { #[test] fn test_cookie_set_with_httponly_should_not_be_available_using_getcookiesforurl() { - struct Factory; + let handler = move |_: HyperRequest, mut response: HyperResponse| { + let mut pair = CookiePair::new("mozillaIs".to_owned(), "theBest".to_owned()); + pair.httponly = true; + response.headers_mut().set(SetCookie(vec![pair])); + response.send(b"Yay!").unwrap(); + }; + let (mut server, url) = make_server(handler); - impl HttpRequestFactory for Factory { - type R = MockRequest; + let context = new_fetch_context(None); - fn create(&self, _: Url, _: Method, _: Headers) -> Result { - let content = <[_]>::to_vec("Yay!".as_bytes()); - let mut headers = Headers::new(); - headers.set_raw("set-cookie", vec![b"mozillaIs=theBest; HttpOnly;".to_vec()]); - Ok(MockRequest::new(ResponseType::WithHeaders(content, headers))) - } - } + assert_cookie_for_domain(context.state.cookie_jar.clone(), url.as_str(), None); - let url = Url::parse("http://mozilla.com").unwrap(); + let request = Request::from_init(RequestInit { + url: url.clone(), + method: Method::Get, + body: None, + destination: Destination::Document, + origin: url.clone(), + pipeline_id: Some(TEST_PIPELINE_ID), + credentials_mode: CredentialsMode::Include, + .. RequestInit::default() + }); + let response = fetch(Rc::new(request), &mut None, &context); - let http_state = HttpState::new(); - let ui_provider = TestProvider::new(); + let _ = server.close(); - let load_data = LoadData::new(LoadContext::Browsing, url.clone(), &HttpTest); - let _ = load(&load_data, - &ui_provider, &http_state, - None, - &Factory, - DEFAULT_USER_AGENT.into(), - &CancellationListener::new(None), None); + assert!(response.status.unwrap().is_success()); - let mut cookie_jar = http_state.cookie_jar.write().unwrap(); + assert_cookie_for_domain(context.state.cookie_jar.clone(), url.as_str(), Some("mozillaIs=theBest")); + let mut cookie_jar = context.state.cookie_jar.write().unwrap(); assert!(cookie_jar.cookies_for_url(&url, CookieSource::NonHTTP).is_none()); } From c229a0116ead0c0aa1bb9b13ee18e2bf2e67ceaa Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 10 Nov 2016 10:21:09 +0100 Subject: [PATCH 05/12] Rewrite test_when_cookie_received_marked_secure_is_ignored_for_http. --- tests/unit/net/http_loader.rs | 44 +++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs index 154a19ca780..4381b3168de 100644 --- a/tests/unit/net/http_loader.rs +++ b/tests/unit/net/http_loader.rs @@ -972,31 +972,35 @@ fn test_cookie_set_with_httponly_should_not_be_available_using_getcookiesforurl( #[test] fn test_when_cookie_received_marked_secure_is_ignored_for_http() { - struct Factory; + let handler = move |_: HyperRequest, mut response: HyperResponse| { + let mut pair = CookiePair::new("mozillaIs".to_owned(), "theBest".to_owned()); + pair.secure = true; + response.headers_mut().set(SetCookie(vec![pair])); + response.send(b"Yay!").unwrap(); + }; + let (mut server, url) = make_server(handler); - impl HttpRequestFactory for Factory { - type R = MockRequest; + let context = new_fetch_context(None); - fn create(&self, _: Url, _: Method, _: Headers) -> Result { - let content = <[_]>::to_vec("Yay!".as_bytes()); - let mut headers = Headers::new(); - headers.set_raw("set-cookie", vec![b"mozillaIs=theBest; Secure;".to_vec()]); - Ok(MockRequest::new(ResponseType::WithHeaders(content, headers))) - } - } + assert_cookie_for_domain(context.state.cookie_jar.clone(), url.as_str(), None); - let http_state = HttpState::new(); - let ui_provider = TestProvider::new(); + let request = Request::from_init(RequestInit { + url: url.clone(), + method: Method::Get, + body: None, + destination: Destination::Document, + origin: url.clone(), + pipeline_id: Some(TEST_PIPELINE_ID), + credentials_mode: CredentialsMode::Include, + .. RequestInit::default() + }); + let response = fetch(Rc::new(request), &mut None, &context); - let load_data = LoadData::new(LoadContext::Browsing, Url::parse("http://mozilla.com").unwrap(), &HttpTest); - let _ = load(&load_data, - &ui_provider, &http_state, - None, - &Factory, - DEFAULT_USER_AGENT.into(), - &CancellationListener::new(None), None); + let _ = server.close(); - assert_cookie_for_domain(http_state.cookie_jar.clone(), "http://mozilla.com", None); + assert!(response.status.unwrap().is_success()); + + assert_cookie_for_domain(context.state.cookie_jar.clone(), url.as_str(), None); } #[test] From 5a025863419e98a2d37788cf60341addce4b054d Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 10 Nov 2016 11:18:22 +0100 Subject: [PATCH 06/12] Rewrite test_load_sets_content_length_to_length_of_request_body. --- tests/unit/net/http_loader.rs | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs index 4381b3168de..f602f8177dd 100644 --- a/tests/unit/net/http_loader.rs +++ b/tests/unit/net/http_loader.rs @@ -1037,25 +1037,28 @@ fn test_when_cookie_set_marked_httpsonly_secure_isnt_sent_on_http_request() { #[test] fn test_load_sets_content_length_to_length_of_request_body() { - let content = "This is a request body"; + let content = b"This is a request body"; + let content_length = ContentLength(content.len() as u64); + let handler = move |request: HyperRequest, response: HyperResponse| { + assert_eq!(request.headers.get::(), Some(&content_length)); + response.send(content).unwrap(); + }; + let (mut server, url) = make_server(handler); - let url = Url::parse("http://mozilla.com").unwrap(); - let mut load_data = LoadData::new(LoadContext::Browsing, url.clone(), &HttpTest); + let request = Request::from_init(RequestInit { + url: url.clone(), + method: Method::Post, + body: Some(content.to_vec()), + destination: Destination::Document, + origin: url.clone(), + pipeline_id: Some(TEST_PIPELINE_ID), + .. RequestInit::default() + }); + let response = fetch_sync(request, None); - load_data.data = Some(<[_]>::to_vec(content.as_bytes())); + let _ = server.close(); - let mut content_len_headers = Headers::new(); - content_len_headers.set(ContentLength(content.as_bytes().len() as u64)); - - let http_state = HttpState::new(); - let ui_provider = TestProvider::new(); - - let _ = load(&load_data.clone(), &ui_provider, &http_state, - None, &AssertMustIncludeHeadersRequestFactory { - expected_headers: content_len_headers, - body: <[_]>::to_vec(&*load_data.data.unwrap()) - }, DEFAULT_USER_AGENT.into(), - &CancellationListener::new(None), None); + assert!(response.status.unwrap().is_success()); } #[test] From 6319d7cb990bad9203aa9f14165379169ef244fa Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 10 Nov 2016 11:22:23 +0100 Subject: [PATCH 07/12] Rewrite test_load_uses_explicit_accept_from_headers_in_load_data. --- tests/unit/net/http_loader.rs | 38 ++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs index f602f8177dd..f964c42803e 100644 --- a/tests/unit/net/http_loader.rs +++ b/tests/unit/net/http_loader.rs @@ -1063,28 +1063,30 @@ fn test_load_sets_content_length_to_length_of_request_body() { #[test] fn test_load_uses_explicit_accept_from_headers_in_load_data() { - let text_html = qitem(Mime(TopLevel::Text, SubLevel::Html, vec![])); + let accept = Accept(vec![qitem(Mime(TopLevel::Text, SubLevel::Html, vec![]))]); + let expected_accept = accept.clone(); + let handler = move |request: HyperRequest, response: HyperResponse| { + assert_eq!(request.headers.get::(), Some(&expected_accept)); + response.send(b"Yay!").unwrap(); + }; + let (mut server, url) = make_server(handler); let mut accept_headers = Headers::new(); - accept_headers.set(Accept(vec![text_html.clone()])); + accept_headers.set(accept); + let request = Request::from_init(RequestInit { + url: url.clone(), + method: Method::Get, + headers: accept_headers, + destination: Destination::Document, + origin: url.clone(), + pipeline_id: Some(TEST_PIPELINE_ID), + .. RequestInit::default() + }); + let response = fetch_sync(request, None); - let url = Url::parse("http://mozilla.com").unwrap(); - let mut load_data = LoadData::new(LoadContext::Browsing, url.clone(), &HttpTest); + let _ = server.close(); - load_data.data = Some(<[_]>::to_vec("Yay!".as_bytes())); - load_data.headers.set(Accept(vec![text_html.clone()])); - - let http_state = HttpState::new(); - let ui_provider = TestProvider::new(); - - let _ = load(&load_data, - &ui_provider, &http_state, - None, - &AssertMustIncludeHeadersRequestFactory { - expected_headers: accept_headers, - body: <[_]>::to_vec("Yay!".as_bytes()) - }, DEFAULT_USER_AGENT.into(), - &CancellationListener::new(None), None); + assert!(response.status.unwrap().is_success()); } #[test] From e12a6d7f4e27a86b843748b2618045b196968385 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 10 Nov 2016 11:26:54 +0100 Subject: [PATCH 08/12] Rewrite test_load_sets_default_accept_to_html_xhtml_xml_and_then_anything_else. --- tests/unit/net/http_loader.rs | 41 +++++++++++++++++------------------ 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs index f964c42803e..25374f319f4 100644 --- a/tests/unit/net/http_loader.rs +++ b/tests/unit/net/http_loader.rs @@ -1091,30 +1091,29 @@ fn test_load_uses_explicit_accept_from_headers_in_load_data() { #[test] fn test_load_sets_default_accept_to_html_xhtml_xml_and_then_anything_else() { - let mut accept_headers = Headers::new(); - accept_headers.set(Accept(vec![ - qitem(Mime(TopLevel::Text, SubLevel::Html, vec![])), - qitem(Mime(TopLevel::Application, SubLevel::Ext("xhtml+xml".to_owned()), vec![])), - QualityItem::new(Mime(TopLevel::Application, SubLevel::Xml, vec![]), Quality(900)), - QualityItem::new(Mime(TopLevel::Star, SubLevel::Star, vec![]), Quality(800)), - ])); + let handler = move |request: HyperRequest, response: HyperResponse| { + assert_eq!(request.headers.get::(), Some(&Accept(vec![ + qitem(Mime(TopLevel::Text, SubLevel::Html, vec![])), + qitem(Mime(TopLevel::Application, SubLevel::Ext("xhtml+xml".to_owned()), vec![])), + QualityItem::new(Mime(TopLevel::Application, SubLevel::Xml, vec![]), Quality(900)), + ]))); + response.send(b"Yay!").unwrap(); + }; + let (mut server, url) = make_server(handler); - let url = Url::parse("http://mozilla.com").unwrap(); - let mut load_data = LoadData::new(LoadContext::Browsing, url.clone(), &HttpTest); + let request = Request::from_init(RequestInit { + url: url.clone(), + method: Method::Get, + destination: Destination::Document, + origin: url.clone(), + pipeline_id: Some(TEST_PIPELINE_ID), + .. RequestInit::default() + }); + let response = fetch_sync(request, None); - load_data.data = Some(<[_]>::to_vec("Yay!".as_bytes())); + let _ = server.close(); - let http_state = HttpState::new(); - let ui_provider = TestProvider::new(); - - let _ = load(&load_data, - &ui_provider, &http_state, - None, - &AssertMustIncludeHeadersRequestFactory { - expected_headers: accept_headers, - body: <[_]>::to_vec("Yay!".as_bytes()) - }, DEFAULT_USER_AGENT.into(), - &CancellationListener::new(None), None); + assert!(response.status.unwrap().is_success()); } #[test] From 195774436b2954640923dc1ad30cc69b2fb36629 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 10 Nov 2016 11:32:31 +0100 Subject: [PATCH 09/12] Rewrite test_load_uses_explicit_accept_encoding_from_load_data_headers. --- tests/unit/net/http_loader.rs | 37 ++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs index 25374f319f4..18b886ace00 100644 --- a/tests/unit/net/http_loader.rs +++ b/tests/unit/net/http_loader.rs @@ -1118,25 +1118,30 @@ fn test_load_sets_default_accept_to_html_xhtml_xml_and_then_anything_else() { #[test] fn test_load_uses_explicit_accept_encoding_from_load_data_headers() { + let accept_encoding = AcceptEncoding(vec![qitem(Encoding::Chunked)]); + let expected_accept_encoding = accept_encoding.clone(); + let handler = move |request: HyperRequest, response: HyperResponse| { + assert_eq!(request.headers.get::(), Some(&expected_accept_encoding)); + response.send(b"Yay!").unwrap(); + }; + let (mut server, url) = make_server(handler); + let mut accept_encoding_headers = Headers::new(); - accept_encoding_headers.set(AcceptEncoding(vec![qitem(Encoding::Chunked)])); + accept_encoding_headers.set(accept_encoding); + let request = Request::from_init(RequestInit { + url: url.clone(), + method: Method::Get, + headers: accept_encoding_headers, + destination: Destination::Document, + origin: url.clone(), + pipeline_id: Some(TEST_PIPELINE_ID), + .. RequestInit::default() + }); + let response = fetch_sync(request, None); - let url = Url::parse("http://mozilla.com").unwrap(); - let mut load_data = LoadData::new(LoadContext::Browsing, url.clone(), &HttpTest); - load_data.data = Some(<[_]>::to_vec("Yay!".as_bytes())); - load_data.headers.set(AcceptEncoding(vec![qitem(Encoding::Chunked)])); + let _ = server.close(); - let http_state = HttpState::new(); - let ui_provider = TestProvider::new(); - - let _ = load(&load_data, - &ui_provider, &http_state, - None, - &AssertMustIncludeHeadersRequestFactory { - expected_headers: accept_encoding_headers, - body: <[_]>::to_vec("Yay!".as_bytes()) - }, DEFAULT_USER_AGENT.into(), - &CancellationListener::new(None), None); + assert!(response.status.unwrap().is_success()); } #[test] From bced313c47ec9f7f8a97f094bb4df84c94bc8086 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 10 Nov 2016 11:34:48 +0100 Subject: [PATCH 10/12] Rewrite test_load_sets_default_accept_encoding_to_gzip_and_deflate. --- tests/unit/net/http_loader.rs | 37 +++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs index 18b886ace00..d307ffbf5b1 100644 --- a/tests/unit/net/http_loader.rs +++ b/tests/unit/net/http_loader.rs @@ -1146,26 +1146,29 @@ fn test_load_uses_explicit_accept_encoding_from_load_data_headers() { #[test] fn test_load_sets_default_accept_encoding_to_gzip_and_deflate() { - let mut accept_encoding_headers = Headers::new(); - accept_encoding_headers.set(AcceptEncoding(vec![qitem(Encoding::Gzip), - qitem(Encoding::Deflate), - qitem(Encoding::EncodingExt("br".to_owned()))])); + let handler = move |request: HyperRequest, response: HyperResponse| { + assert_eq!(request.headers.get::(), Some(&AcceptEncoding(vec![ + qitem(Encoding::Gzip), + qitem(Encoding::Deflate), + qitem(Encoding::EncodingExt("br".to_owned())) + ]))); + response.send(b"Yay!").unwrap(); + }; + let (mut server, url) = make_server(handler); - let url = Url::parse("http://mozilla.com").unwrap(); - let mut load_data = LoadData::new(LoadContext::Browsing, url.clone(), &HttpTest); - load_data.data = Some(<[_]>::to_vec("Yay!".as_bytes())); + let request = Request::from_init(RequestInit { + url: url.clone(), + method: Method::Get, + destination: Destination::Document, + origin: url.clone(), + pipeline_id: Some(TEST_PIPELINE_ID), + .. RequestInit::default() + }); + let response = fetch_sync(request, None); - let http_state = HttpState::new(); - let ui_provider = TestProvider::new(); + let _ = server.close(); - let _ = load(&load_data, - &ui_provider, &http_state, - None, - &AssertMustIncludeHeadersRequestFactory { - expected_headers: accept_encoding_headers, - body: <[_]>::to_vec("Yay!".as_bytes()) - }, DEFAULT_USER_AGENT.into(), - &CancellationListener::new(None), None); + assert!(response.status.unwrap().is_success()); } #[test] From 581c6dfe1b3c5e3e4064d4ba05068728c200a0ef Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 10 Nov 2016 12:57:19 +0100 Subject: [PATCH 11/12] Rewrite test_load_errors_when_there_a_redirect_loop. --- tests/unit/net/http_loader.rs | 53 ++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs index d307ffbf5b1..f87a8c6c5da 100644 --- a/tests/unit/net/http_loader.rs +++ b/tests/unit/net/http_loader.rs @@ -30,7 +30,7 @@ use net::resource_thread::{AuthCacheEntry, CancellationListener}; use net::test::{HttpRequest, HttpRequestFactory, HttpState, LoadError, UIProvider, load}; use net::test::{HttpResponse, LoadErrorType}; use net_traits::{CookieSource, IncludeSubdomains, LoadContext, LoadData}; -use net_traits::{CustomResponse, LoadOrigin, Metadata, ReferrerPolicy}; +use net_traits::{CustomResponse, LoadOrigin, Metadata, NetworkError, ReferrerPolicy}; use net_traits::request::{Request, RequestInit, CredentialsMode, Destination}; use net_traits::response::ResponseBody; use new_fetch_context; @@ -1173,33 +1173,40 @@ fn test_load_sets_default_accept_encoding_to_gzip_and_deflate() { #[test] fn test_load_errors_when_there_a_redirect_loop() { - struct Factory; + let url_b_for_a = Arc::new(Mutex::new(None::)); + let url_b_for_a_clone = url_b_for_a.clone(); + let handler_a = move |_: HyperRequest, mut response: HyperResponse| { + response.headers_mut().set(Location(url_b_for_a_clone.lock().unwrap().as_ref().unwrap().to_string())); + *response.status_mut() = StatusCode::MovedPermanently; + response.send(b"").unwrap(); + }; + let (mut server_a, url_a) = make_server(handler_a); - impl HttpRequestFactory for Factory { - type R = MockRequest; + let url_a_for_b = url_a.clone(); + let handler_b = move |_: HyperRequest, mut response: HyperResponse| { + response.headers_mut().set(Location(url_a_for_b.to_string())); + *response.status_mut() = StatusCode::MovedPermanently; + response.send(b"").unwrap(); + }; + let (mut server_b, url_b) = make_server(handler_b); - fn create(&self, url: Url, _: Method, _: Headers) -> Result { - if url.domain().unwrap() == "mozilla.com" { - Ok(MockRequest::new(ResponseType::Redirect("http://mozilla.org".to_owned()))) - } else if url.domain().unwrap() == "mozilla.org" { - Ok(MockRequest::new(ResponseType::Redirect("http://mozilla.com".to_owned()))) - } else { - panic!("unexpected host {:?}", url) - } - } - } + *url_b_for_a.lock().unwrap() = Some(url_b.clone()); - let url = Url::parse("http://mozilla.com").unwrap(); - let load_data = LoadData::new(LoadContext::Browsing, url.clone(), &HttpTest); + let request = Request::from_init(RequestInit { + url: url_a.clone(), + method: Method::Get, + destination: Destination::Document, + origin: url_a.clone(), + pipeline_id: Some(TEST_PIPELINE_ID), + .. RequestInit::default() + }); + let response = fetch_sync(request, None); - let http_state = HttpState::new(); - let ui_provider = TestProvider::new(); + let _ = server_a.close(); + let _ = server_b.close(); - match load(&load_data, &ui_provider, &http_state, None, &Factory, - DEFAULT_USER_AGENT.into(), &CancellationListener::new(None), None) { - Err(ref load_err) if load_err.error == LoadErrorType::RedirectLoop => (), - _ => panic!("expected max redirects to fail") - } + assert_eq!(response.get_network_error(), + Some(&NetworkError::Internal("Too many redirects".to_owned()))); } #[test] From 65602de40318ddad9cea11b3993f400af2bef90e Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 10 Nov 2016 13:13:31 +0100 Subject: [PATCH 12/12] Add a successful test for a redirect loop. --- tests/unit/net/http_loader.rs | 47 +++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs index f87a8c6c5da..d5e562d12e0 100644 --- a/tests/unit/net/http_loader.rs +++ b/tests/unit/net/http_loader.rs @@ -38,6 +38,7 @@ use std::borrow::Cow; use std::io::{self, Cursor, Read, Write}; use std::rc::Rc; use std::sync::{Arc, Mutex, RwLock, mpsc}; +use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::mpsc::Receiver; use std::thread; use url::Url; @@ -1209,6 +1210,52 @@ fn test_load_errors_when_there_a_redirect_loop() { Some(&NetworkError::Internal("Too many redirects".to_owned()))); } +#[test] +fn test_load_succeeds_with_a_redirect_loop() { + let url_b_for_a = Arc::new(Mutex::new(None::)); + let url_b_for_a_clone = url_b_for_a.clone(); + let handled_a = AtomicBool::new(false); + let handler_a = move |_: HyperRequest, mut response: HyperResponse| { + if !handled_a.swap(true, Ordering::SeqCst) { + response.headers_mut().set(Location(url_b_for_a_clone.lock().unwrap().as_ref().unwrap().to_string())); + *response.status_mut() = StatusCode::MovedPermanently; + response.send(b"").unwrap(); + } else { + response.send(b"Success").unwrap(); + } + }; + let (mut server_a, url_a) = make_server(handler_a); + + let url_a_for_b = url_a.clone(); + let handler_b = move |_: HyperRequest, mut response: HyperResponse| { + response.headers_mut().set(Location(url_a_for_b.to_string())); + *response.status_mut() = StatusCode::MovedPermanently; + response.send(b"").unwrap(); + }; + let (mut server_b, url_b) = make_server(handler_b); + + *url_b_for_a.lock().unwrap() = Some(url_b.clone()); + + let request = Request::from_init(RequestInit { + url: url_a.clone(), + method: Method::Get, + destination: Destination::Document, + origin: url_a.clone(), + pipeline_id: Some(TEST_PIPELINE_ID), + .. RequestInit::default() + }); + let response = fetch_sync(request, None); + + let _ = server_a.close(); + let _ = server_b.close(); + + let response = response.to_actual(); + assert_eq!(*response.url_list.borrow(), + [url_a.clone(), url_b, url_a]); + assert_eq!(*response.body.lock().unwrap(), + ResponseBody::Done(b"Success".to_vec())); +} + #[test] fn test_load_errors_when_there_is_too_many_redirects() { struct Factory;