aboutsummaryrefslogtreecommitdiffstats
path: root/components/net/tests/fetch.rs
diff options
context:
space:
mode:
Diffstat (limited to 'components/net/tests/fetch.rs')
-rw-r--r--components/net/tests/fetch.rs65
1 files changed, 33 insertions, 32 deletions
diff --git a/components/net/tests/fetch.rs b/components/net/tests/fetch.rs
index ea51fe5d757..b5af2b640d5 100644
--- a/components/net/tests/fetch.rs
+++ b/components/net/tests/fetch.rs
@@ -65,7 +65,7 @@ fn test_fetch_response_is_not_network_error() {
};
let (server, url) = make_server(handler);
- let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.origin(url.origin())
.build();
let fetch_response = fetch(request, None);
@@ -79,7 +79,7 @@ fn test_fetch_response_is_not_network_error() {
#[test]
fn test_fetch_on_bad_port_is_network_error() {
let url = ServoUrl::parse("http://www.example.org:6667").unwrap();
- let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.origin(url.origin())
.build();
let fetch_response = fetch(request, None);
@@ -101,7 +101,7 @@ fn test_fetch_response_body_matches_const_message() {
};
let (server, url) = make_server(handler);
- let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.origin(url.origin())
.build();
let fetch_response = fetch(request, None);
@@ -121,7 +121,7 @@ fn test_fetch_response_body_matches_const_message() {
#[test]
fn test_fetch_aboutblank() {
let url = ServoUrl::parse("about:blank").unwrap();
- let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.origin(url.origin())
.build();
@@ -186,7 +186,7 @@ fn test_fetch_blob() {
);
let url = ServoUrl::parse(&format!("blob:{}{}", origin.as_str(), id.simple())).unwrap();
- let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.origin(origin.origin())
.build();
@@ -228,7 +228,7 @@ fn test_file() {
.unwrap();
let url = ServoUrl::from_file_path(path.clone()).unwrap();
- let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.origin(url.origin())
.build();
@@ -271,7 +271,7 @@ fn test_file() {
#[test]
fn test_fetch_ftp() {
let url = ServoUrl::parse("ftp://not-supported").unwrap();
- let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.origin(url.origin())
.build();
let fetch_response = fetch(request, None);
@@ -281,7 +281,7 @@ fn test_fetch_ftp() {
#[test]
fn test_fetch_bogus_scheme() {
let url = ServoUrl::parse("bogus://whatever").unwrap();
- let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.origin(url.origin())
.build();
let fetch_response = fetch(request, None);
@@ -330,7 +330,7 @@ fn test_cors_preflight_fetch() {
let (server, url) = make_server(handler);
let target_url = url.clone().join("a.html").unwrap();
- let mut request = RequestBuilder::new(url, Referrer::ReferrerUrl(target_url)).build();
+ let mut request = RequestBuilder::new(None, url, Referrer::ReferrerUrl(target_url)).build();
request.referrer_policy = ReferrerPolicy::Origin;
request.use_cors_preflight = true;
request.mode = RequestMode::CorsMode;
@@ -383,7 +383,7 @@ fn test_cors_preflight_cache_fetch() {
};
let (server, url) = make_server(handler);
- let mut request = RequestBuilder::new(url, Referrer::NoReferrer).build();
+ let mut request = RequestBuilder::new(None, url, Referrer::NoReferrer).build();
request.use_cors_preflight = true;
request.mode = RequestMode::CorsMode;
let wrapped_request0 = request.clone();
@@ -448,7 +448,7 @@ fn test_cors_preflight_fetch_network_error() {
};
let (server, url) = make_server(handler);
- let mut request = RequestBuilder::new(url, Referrer::NoReferrer).build();
+ let mut request = RequestBuilder::new(None, url, Referrer::NoReferrer).build();
request.method = Method::from_bytes(b"CHICKEN").unwrap();
request.use_cors_preflight = true;
request.mode = RequestMode::CorsMode;
@@ -477,7 +477,7 @@ fn test_fetch_response_is_basic_filtered() {
};
let (server, url) = make_server(handler);
- let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.origin(url.origin())
.build();
let fetch_response = fetch(request, None);
@@ -542,7 +542,7 @@ fn test_fetch_response_is_cors_filtered() {
let (server, url) = make_server(handler);
// an origin mis-match will stop it from defaulting to a basic filtered response
- let mut request = RequestBuilder::new(url, Referrer::NoReferrer).build();
+ let mut request = RequestBuilder::new(None, url, Referrer::NoReferrer).build();
request.mode = RequestMode::CorsMode;
let fetch_response = fetch(request, None);
let _ = server.close();
@@ -576,7 +576,7 @@ fn test_fetch_response_is_opaque_filtered() {
let (server, url) = make_server(handler);
// an origin mis-match will fall through to an Opaque filtered response
- let request = RequestBuilder::new(url, Referrer::NoReferrer).build();
+ let request = RequestBuilder::new(None, url, Referrer::NoReferrer).build();
let fetch_response = fetch(request, None);
let _ = server.close();
@@ -624,7 +624,7 @@ fn test_fetch_response_is_opaque_redirect_filtered() {
let (server, url) = make_server(handler);
- let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let mut request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.origin(url.origin())
.build();
request.redirect_mode = RedirectMode::Manual;
@@ -660,7 +660,7 @@ fn test_fetch_with_local_urls_only() {
let (server, server_url) = make_server(handler);
let do_fetch = |url: ServoUrl| {
- let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let mut request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.origin(url.origin())
.build();
@@ -728,7 +728,7 @@ fn test_fetch_with_hsts() {
HstsEntry::new("localhost".to_owned(), IncludeSubdomains::NotIncluded, None).unwrap(),
);
}
- let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let mut request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.origin(url.origin())
.build();
// Set the flag.
@@ -782,7 +782,7 @@ fn test_load_adds_host_to_hsts_list_when_url_is_https() {
context.state.override_manager.add_override(certificate);
}
- let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.method(Method::GET)
.body(None)
.destination(Destination::Document)
@@ -838,7 +838,7 @@ fn test_fetch_self_signed() {
protocols: Arc::new(ProtocolRegistry::default()),
};
- let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.method(Method::GET)
.body(None)
.destination(Destination::Document)
@@ -859,7 +859,7 @@ fn test_fetch_self_signed() {
context.state.override_manager.add_override(certificate);
}
- let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.method(Method::GET)
.body(None)
.destination(Destination::Document)
@@ -884,7 +884,7 @@ fn test_fetch_with_sri_network_error() {
};
let (server, url) = make_server(handler);
- let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let mut request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.origin(url.origin())
.build();
// To calulate hash use :
@@ -910,7 +910,7 @@ fn test_fetch_with_sri_sucess() {
};
let (server, url) = make_server(handler);
- let mut request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let mut request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.origin(url.origin())
.build();
// To calulate hash use :
@@ -952,7 +952,7 @@ fn test_fetch_blocked_nosniff() {
let (server, url) = make_server(handler);
- let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.origin(url.origin())
.destination(destination)
.build();
@@ -999,7 +999,7 @@ fn setup_server_and_fetch(message: &'static [u8], redirect_cap: u32) -> Response
let (server, url) = make_server(handler);
- let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.origin(url.origin())
.build();
let fetch_response = fetch(request, None);
@@ -1089,7 +1089,7 @@ fn test_fetch_redirect_updates_method_runner(
let (server, url) = crate::make_server(handler);
- let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.origin(url.origin())
.method(method)
.build();
@@ -1174,7 +1174,7 @@ fn test_fetch_async_returns_complete_response() {
};
let (server, url) = make_server(handler);
- let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.origin(url.origin())
.build();
let fetch_response = fetch(request, None);
@@ -1194,7 +1194,7 @@ fn test_opaque_filtered_fetch_async_returns_complete_response() {
let (server, url) = make_server(handler);
// an origin mis-match will fall through to an Opaque filtered response
- let request = RequestBuilder::new(url, Referrer::NoReferrer).build();
+ let request = RequestBuilder::new(None, url, Referrer::NoReferrer).build();
let fetch_response = fetch(request, None);
let _ = server.close();
@@ -1228,7 +1228,7 @@ fn test_opaque_redirect_filtered_fetch_async_returns_complete_response() {
};
let (server, url) = make_server(handler);
- let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.origin(url.origin())
.redirect_mode(RedirectMode::Manual)
.build();
@@ -1253,7 +1253,7 @@ fn test_fetch_with_devtools() {
let (server, url) = make_server(handler);
- let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.origin(url.origin())
.redirect_mode(RedirectMode::Manual)
.pipeline_id(Some(TEST_PIPELINE_ID))
@@ -1341,12 +1341,13 @@ fn test_fetch_request_intercepted() {
static HEADERVALUE: &str = "custom-value";
static STATUS_MESSAGE: &[u8] = b"custom status message";
- let (embedder_proxy, mut embedder_receiver) = create_embedder_proxy_and_receiver();
+ let (embedder_proxy, embedder_receiver) = create_embedder_proxy_and_receiver();
std::thread::spawn(move || {
- let (_browser_context_id, embedder_msg) = embedder_receiver.recv_embedder_msg();
+ let embedder_msg = embedder_receiver.recv().unwrap();
match embedder_msg {
embedder_traits::EmbedderMsg::WebResourceRequested(
+ _,
web_resource_request,
response_sender,
) => {
@@ -1396,7 +1397,7 @@ fn test_fetch_request_intercepted() {
};
let url = ServoUrl::parse("http://www.example.org").unwrap();
- let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+ let request = RequestBuilder::new(None, url.clone(), Referrer::NoReferrer)
.origin(url.origin())
.build();
let response = fetch_with_context(request, &mut context);
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 20:30:53 +0000