aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/net/fetch.rs36
-rw-r--r--tests/unit/net/http_loader.rs70
2 files changed, 53 insertions, 53 deletions
diff --git a/tests/unit/net/fetch.rs b/tests/unit/net/fetch.rs
index 571ad2cee71..9f9607b1743 100644
--- a/tests/unit/net/fetch.rs
+++ b/tests/unit/net/fetch.rs
@@ -24,7 +24,7 @@ use net::fetch::cors_cache::CORSCache;
use net::fetch::methods::{FetchContext, fetch, fetch_with_cors_cache};
use net::http_loader::HttpState;
use net_traits::FetchTaskTarget;
-use net_traits::request::{Origin, RedirectMode, Referer, Request, RequestMode};
+use net_traits::request::{Origin, RedirectMode, Referrer, Request, RequestMode};
use net_traits::response::{CacheState, Response, ResponseBody, ResponseType};
use std::fs::File;
use std::io::Read;
@@ -94,7 +94,7 @@ fn test_fetch_response_is_not_network_error() {
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
- *request.referer.borrow_mut() = Referer::NoReferer;
+ *request.referrer.borrow_mut() = Referrer::NoReferrer;
let fetch_response = fetch_sync(request, None);
let _ = server.close();
@@ -113,7 +113,7 @@ fn test_fetch_response_body_matches_const_message() {
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
- *request.referer.borrow_mut() = Referer::NoReferer;
+ *request.referrer.borrow_mut() = Referrer::NoReferrer;
let fetch_response = fetch_sync(request, None);
let _ = server.close();
@@ -133,7 +133,7 @@ fn test_fetch_aboutblank() {
let url = Url::parse("about:blank").unwrap();
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
- *request.referer.borrow_mut() = Referer::NoReferer;
+ *request.referrer.borrow_mut() = Referrer::NoReferrer;
let fetch_response = fetch_sync(request, None);
assert!(!fetch_response.is_network_error());
assert!(*fetch_response.body.lock().unwrap() == ResponseBody::Done(vec![]));
@@ -217,7 +217,7 @@ fn test_cors_preflight_fetch() {
let origin = Origin::Origin(UrlOrigin::new_opaque());
let mut request = Request::new(url.clone(), Some(origin), false, None);
- *request.referer.borrow_mut() = Referer::RefererUrl(target_url);
+ *request.referrer.borrow_mut() = Referrer::ReferrerUrl(target_url);
*request.referrer_policy.get_mut() = Some(ReferrerPolicy::Origin);
request.use_cors_preflight = true;
request.mode = RequestMode::CORSMode;
@@ -255,7 +255,7 @@ fn test_cors_preflight_cache_fetch() {
let origin = Origin::Origin(UrlOrigin::new_opaque());
let mut request = Request::new(url.clone(), Some(origin.clone()), false, None);
- *request.referer.borrow_mut() = Referer::NoReferer;
+ *request.referrer.borrow_mut() = Referrer::NoReferrer;
request.use_cors_preflight = true;
request.mode = RequestMode::CORSMode;
let wrapped_request0 = Rc::new(request.clone());
@@ -307,7 +307,7 @@ fn test_cors_preflight_fetch_network_error() {
let origin = Origin::Origin(UrlOrigin::new_opaque());
let mut request = Request::new(url, Some(origin), false, None);
*request.method.borrow_mut() = Method::Extension("CHICKEN".to_owned());
- *request.referer.borrow_mut() = Referer::NoReferer;
+ *request.referrer.borrow_mut() = Referrer::NoReferrer;
request.use_cors_preflight = true;
request.mode = RequestMode::CORSMode;
let fetch_response = fetch_sync(request, None);
@@ -330,7 +330,7 @@ fn test_fetch_response_is_basic_filtered() {
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
- *request.referer.borrow_mut() = Referer::NoReferer;
+ *request.referrer.borrow_mut() = Referrer::NoReferrer;
let fetch_response = fetch_sync(request, None);
let _ = server.close();
@@ -375,7 +375,7 @@ fn test_fetch_response_is_cors_filtered() {
// an origin mis-match will stop it from defaulting to a basic filtered response
let origin = Origin::Origin(UrlOrigin::new_opaque());
let mut request = Request::new(url, Some(origin), false, None);
- *request.referer.borrow_mut() = Referer::NoReferer;
+ *request.referrer.borrow_mut() = Referrer::NoReferrer;
request.mode = RequestMode::CORSMode;
let fetch_response = fetch_sync(request, None);
let _ = server.close();
@@ -407,7 +407,7 @@ fn test_fetch_response_is_opaque_filtered() {
// an origin mis-match will fall through to an Opaque filtered response
let origin = Origin::Origin(UrlOrigin::new_opaque());
let request = Request::new(url, Some(origin), false, None);
- *request.referer.borrow_mut() = Referer::NoReferer;
+ *request.referrer.borrow_mut() = Referrer::NoReferrer;
let fetch_response = fetch_sync(request, None);
let _ = server.close();
@@ -454,7 +454,7 @@ fn test_fetch_response_is_opaque_redirect_filtered() {
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
- *request.referer.borrow_mut() = Referer::NoReferer;
+ *request.referrer.borrow_mut() = Referrer::NoReferrer;
request.redirect_mode.set(RedirectMode::Manual);
let fetch_response = fetch_sync(request, None);
let _ = server.close();
@@ -488,7 +488,7 @@ fn test_fetch_with_local_urls_only() {
let do_fetch = |url: Url| {
let origin = Origin::Origin(url.origin());
let mut request = Request::new(url, Some(origin), false, None);
- *request.referer.borrow_mut() = Referer::NoReferer;
+ *request.referrer.borrow_mut() = Referrer::NoReferrer;
// Set the flag.
request.local_urls_only = true;
@@ -529,7 +529,7 @@ fn setup_server_and_fetch(message: &'static [u8], redirect_cap: u32) -> Response
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
- *request.referer.borrow_mut() = Referer::NoReferer;
+ *request.referrer.borrow_mut() = Referrer::NoReferrer;
let fetch_response = fetch_sync(request, None);
let _ = server.close();
fetch_response
@@ -612,7 +612,7 @@ fn test_fetch_redirect_updates_method_runner(tx: Sender<bool>, status_code: Stat
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
- *request.referer.borrow_mut() = Referer::NoReferer;
+ *request.referrer.borrow_mut() = Referrer::NoReferrer;
*request.method.borrow_mut() = method;
let _ = fetch_sync(request, None);
@@ -687,7 +687,7 @@ fn test_fetch_async_returns_complete_response() {
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
- *request.referer.borrow_mut() = Referer::NoReferer;
+ *request.referrer.borrow_mut() = Referrer::NoReferrer;
let (tx, rx) = channel();
let listener = Box::new(FetchResponseCollector {
@@ -712,7 +712,7 @@ fn test_opaque_filtered_fetch_async_returns_complete_response() {
// an origin mis-match will fall through to an Opaque filtered response
let origin = Origin::Origin(UrlOrigin::new_opaque());
let request = Request::new(url, Some(origin), false, None);
- *request.referer.borrow_mut() = Referer::NoReferer;
+ *request.referrer.borrow_mut() = Referrer::NoReferrer;
let (tx, rx) = channel();
let listener = Box::new(FetchResponseCollector {
@@ -752,7 +752,7 @@ fn test_opaque_redirect_filtered_fetch_async_returns_complete_response() {
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
- *request.referer.borrow_mut() = Referer::NoReferer;
+ *request.referrer.borrow_mut() = Referrer::NoReferrer;
request.redirect_mode.set(RedirectMode::Manual);
let (tx, rx) = channel();
@@ -780,7 +780,7 @@ fn test_fetch_with_devtools() {
let origin = Origin::Origin(url.origin());
let pipeline_id = PipelineId::fake_root_pipeline_id();
let request = Request::new(url.clone(), Some(origin), false, Some(pipeline_id));
- *request.referer.borrow_mut() = Referer::NoReferer;
+ *request.referrer.borrow_mut() = Referrer::NoReferrer;
let (devtools_chan, devtools_port) = channel::<DevtoolsControlMsg>();
diff --git a/tests/unit/net/http_loader.rs b/tests/unit/net/http_loader.rs
index 5530134a15c..e6545a9c818 100644
--- a/tests/unit/net/http_loader.rs
+++ b/tests/unit/net/http_loader.rs
@@ -1625,9 +1625,9 @@ fn test_auth_ui_needs_www_auth() {
}
}
-fn assert_referer_header_matches(origin_info: &LoadOrigin,
- request_url: &str,
- expected_referrer: &str) {
+fn assert_referrer_header_matches(origin_info: &LoadOrigin,
+ request_url: &str,
+ expected_referrer: &str) {
let url = Url::parse(request_url).unwrap();
let ui_provider = TestProvider::new();
@@ -1635,20 +1635,20 @@ fn assert_referer_header_matches(origin_info: &LoadOrigin,
url.clone(),
origin_info);
- let mut referer_headers = Headers::new();
- referer_headers.set(Referer(expected_referrer.to_owned()));
+ let mut referrer_headers = Headers::new();
+ referrer_headers.set(Referer(expected_referrer.to_owned()));
let http_state = HttpState::new();
let _ = load(&load_data.clone(), &ui_provider, &http_state, None,
&AssertMustIncludeHeadersRequestFactory {
- expected_headers: referer_headers,
+ expected_headers: referrer_headers,
body: <[_]>::to_vec(&[])
}, DEFAULT_USER_AGENT.to_owned(),
&CancellationListener::new(None), None);
}
-fn assert_referer_header_not_included(origin_info: &LoadOrigin, request_url: &str) {
+fn assert_referrer_header_not_included(origin_info: &LoadOrigin, request_url: &str) {
let url = Url::parse(request_url).unwrap();
let ui_provider = TestProvider::new();
@@ -1667,7 +1667,7 @@ fn assert_referer_header_not_included(origin_info: &LoadOrigin, request_url: &st
}
#[test]
-fn test_referer_set_to_origin_with_origin_policy() {
+fn test_referrer_set_to_origin_with_origin_policy() {
let request_url = "http://mozilla.com";
let referrer_url = "http://username:password@someurl.com/some/path#fragment";
let referrer_policy = Some(ReferrerPolicy::Origin);
@@ -1678,11 +1678,11 @@ fn test_referer_set_to_origin_with_origin_policy() {
referrer_policy: referrer_policy
};
- assert_referer_header_matches(&origin_info, request_url, expected_referrer);
+ assert_referrer_header_matches(&origin_info, request_url, expected_referrer);
}
#[test]
-fn test_referer_set_to_ref_url_with_sameorigin_policy_same_orig() {
+fn test_referrer_set_to_ref_url_with_sameorigin_policy_same_orig() {
let request_url = "http://mozilla.com";
let referrer_url = "http://username:password@mozilla.com/some/path#fragment";
let referrer_policy = Some(ReferrerPolicy::SameOrigin);
@@ -1693,11 +1693,11 @@ fn test_referer_set_to_ref_url_with_sameorigin_policy_same_orig() {
referrer_policy: referrer_policy
};
- assert_referer_header_matches(&origin_info, request_url, expected_referrer);
+ assert_referrer_header_matches(&origin_info, request_url, expected_referrer);
}
#[test]
-fn test_no_referer_set_with_sameorigin_policy_cross_orig() {
+fn test_no_referrer_set_with_sameorigin_policy_cross_orig() {
let request_url = "http://mozilla.com";
let referrer_url = "http://username:password@someurl.com/some/path#fragment";
let referrer_policy = Some(ReferrerPolicy::SameOrigin);
@@ -1707,11 +1707,11 @@ fn test_no_referer_set_with_sameorigin_policy_cross_orig() {
referrer_policy: referrer_policy
};
- assert_referer_header_not_included(&origin_info, request_url);
+ assert_referrer_header_not_included(&origin_info, request_url);
}
#[test]
-fn test_referer_set_to_stripped_url_with_unsafeurl_policy() {
+fn test_referrer_set_to_stripped_url_with_unsafeurl_policy() {
let request_url = "http://mozilla.com";
let referrer_url = "http://username:password@someurl.com/some/path#fragment";
let referrer_policy = Some(ReferrerPolicy::UnsafeUrl);
@@ -1721,11 +1721,11 @@ fn test_referer_set_to_stripped_url_with_unsafeurl_policy() {
referrer_policy: referrer_policy
};
- assert_referer_header_matches(&origin_info, request_url, expected_referrer);
+ assert_referrer_header_matches(&origin_info, request_url, expected_referrer);
}
#[test]
-fn test_referer_with_originwhencrossorigin_policy_cross_orig() {
+fn test_referrer_with_originwhencrossorigin_policy_cross_orig() {
let request_url = "http://mozilla.com";
let referrer_url = "http://username:password@someurl.com/some/path#fragment";
let referrer_policy = Some(ReferrerPolicy::OriginWhenCrossOrigin);
@@ -1736,11 +1736,11 @@ fn test_referer_with_originwhencrossorigin_policy_cross_orig() {
referrer_policy: referrer_policy
};
- assert_referer_header_matches(&origin_info, request_url, expected_referrer);
+ assert_referrer_header_matches(&origin_info, request_url, expected_referrer);
}
#[test]
-fn test_referer_with_originwhencrossorigin_policy_same_orig() {
+fn test_referrer_with_originwhencrossorigin_policy_same_orig() {
let request_url = "http://mozilla.com";
let referrer_url = "http://username:password@mozilla.com/some/path#fragment";
let referrer_policy = Some(ReferrerPolicy::OriginWhenCrossOrigin);
@@ -1751,11 +1751,11 @@ fn test_referer_with_originwhencrossorigin_policy_same_orig() {
referrer_policy: referrer_policy
};
- assert_referer_header_matches(&origin_info, request_url, expected_referrer);
+ assert_referrer_header_matches(&origin_info, request_url, expected_referrer);
}
#[test]
-fn test_http_to_https_considered_cross_origin_for_referer_header_logic() {
+fn test_http_to_https_considered_cross_origin_for_referrer_header_logic() {
let request_url = "https://mozilla.com";
let referrer_url = "http://mozilla.com/some/path";
let referrer_policy = Some(ReferrerPolicy::OriginWhenCrossOrigin);
@@ -1766,11 +1766,11 @@ fn test_http_to_https_considered_cross_origin_for_referer_header_logic() {
referrer_policy: referrer_policy
};
- assert_referer_header_matches(&origin_info, request_url, expected_referrer);
+ assert_referrer_header_matches(&origin_info, request_url, expected_referrer);
}
#[test]
-fn test_referer_set_to_ref_url_with_noreferrerwhendowngrade_policy_https_to_https() {
+fn test_referrer_set_to_ref_url_with_noreferrerwhendowngrade_policy_https_to_https() {
let request_url = "https://mozilla.com";
let referrer_url = "https://username:password@mozilla.com/some/path#fragment";
let referrer_policy = Some(ReferrerPolicy::NoReferrerWhenDowngrade);
@@ -1781,11 +1781,11 @@ fn test_referer_set_to_ref_url_with_noreferrerwhendowngrade_policy_https_to_http
referrer_policy: referrer_policy,
};
- assert_referer_header_matches(&origin_info, request_url, expected_referrer);
+ assert_referrer_header_matches(&origin_info, request_url, expected_referrer);
}
#[test]
-fn test_no_referer_set_with_noreferrerwhendowngrade_policy_https_to_http() {
+fn test_no_referrer_set_with_noreferrerwhendowngrade_policy_https_to_http() {
let request_url = "http://mozilla.com";
let referrer_url = "https://username:password@mozilla.com/some/path#fragment";
let referrer_policy = Some(ReferrerPolicy::NoReferrerWhenDowngrade);
@@ -1795,11 +1795,11 @@ fn test_no_referer_set_with_noreferrerwhendowngrade_policy_https_to_http() {
referrer_policy: referrer_policy
};
- assert_referer_header_not_included(&origin_info, request_url)
+ assert_referrer_header_not_included(&origin_info, request_url)
}
#[test]
-fn test_referer_set_to_ref_url_with_noreferrerwhendowngrade_policy_http_to_https() {
+fn test_referrer_set_to_ref_url_with_noreferrerwhendowngrade_policy_http_to_https() {
let request_url = "https://mozilla.com";
let referrer_url = "http://username:password@mozilla.com/some/path#fragment";
let referrer_policy = Some(ReferrerPolicy::NoReferrerWhenDowngrade);
@@ -1810,11 +1810,11 @@ fn test_referer_set_to_ref_url_with_noreferrerwhendowngrade_policy_http_to_https
referrer_policy: referrer_policy
};
- assert_referer_header_matches(&origin_info, request_url, expected_referrer);
+ assert_referrer_header_matches(&origin_info, request_url, expected_referrer);
}
#[test]
-fn test_referer_set_to_ref_url_with_noreferrerwhendowngrade_policy_http_to_http() {
+fn test_referrer_set_to_ref_url_with_noreferrerwhendowngrade_policy_http_to_http() {
let request_url = "http://mozilla.com";
let referrer_url = "http://username:password@mozilla.com/some/path#fragment";
let referrer_policy = Some(ReferrerPolicy::NoReferrerWhenDowngrade);
@@ -1825,7 +1825,7 @@ fn test_referer_set_to_ref_url_with_noreferrerwhendowngrade_policy_http_to_http(
referrer_policy: referrer_policy
};
- assert_referer_header_matches(&origin_info, request_url, expected_referrer);
+ assert_referrer_header_matches(&origin_info, request_url, expected_referrer);
}
#[test]
@@ -1840,7 +1840,7 @@ fn test_no_referrer_policy_follows_noreferrerwhendowngrade_https_to_https() {
referrer_policy: referrer_policy
};
- assert_referer_header_matches(&origin_info, request_url, expected_referrer);
+ assert_referrer_header_matches(&origin_info, request_url, expected_referrer);
}
#[test]
@@ -1854,7 +1854,7 @@ fn test_no_referrer_policy_follows_noreferrerwhendowngrade_https_to_http() {
referrer_policy: referrer_policy
};
- assert_referer_header_not_included(&origin_info, request_url);
+ assert_referrer_header_not_included(&origin_info, request_url);
}
#[test]
@@ -1869,7 +1869,7 @@ fn test_no_referrer_policy_follows_noreferrerwhendowngrade_http_to_https() {
referrer_policy: referrer_policy
};
- assert_referer_header_matches(&origin_info, request_url, expected_referrer);
+ assert_referrer_header_matches(&origin_info, request_url, expected_referrer);
}
#[test]
@@ -1884,11 +1884,11 @@ fn test_no_referrer_policy_follows_noreferrerwhendowngrade_http_to_http() {
referrer_policy: referrer_policy
};
- assert_referer_header_matches(&origin_info, request_url, expected_referrer);
+ assert_referrer_header_matches(&origin_info, request_url, expected_referrer);
}
#[test]
-fn test_no_referer_set_with_noreferrer_policy() {
+fn test_no_referrer_set_with_noreferrer_policy() {
let request_url = "http://mozilla.com";
let referrer_url = "http://someurl.com";
let referrer_policy = Some(ReferrerPolicy::NoReferrer);
@@ -1898,7 +1898,7 @@ fn test_no_referer_set_with_noreferrer_policy() {
referrer_policy: referrer_policy,
};
- assert_referer_header_not_included(&origin_info, request_url)
+ assert_referrer_header_not_included(&origin_info, request_url)
}
fn load_request_for_custom_response(expected_body: Vec<u8>) -> (Metadata, String) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 13:18:43 +0000