Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite and remove most unit tests for the legacy fetch stack. #14315

Merged
merged 14 commits into from Nov 24, 2016

Translate a test for ftp URLs to fetch.

  • Loading branch information
Ms2ger committed Nov 23, 2016
commit 621ca6190a1ea5ae6cd15a3ae309bce2eb0a8230
@@ -162,6 +162,16 @@ fn test_fetch_file() {
}
}

#[test]
fn test_fetch_ftp() {
let url = ServoUrl::parse("ftp://not-supported").unwrap();
let origin = Origin::Origin(url.origin());
let request = Request::new(url, Some(origin), false, None);
*request.referrer.borrow_mut() = Referrer::NoReferrer;
let fetch_response = fetch_sync(request, None);
assert!(fetch_response.is_network_error());
}

#[test]
fn test_fetch_bogus_scheme() {
let url = ServoUrl::parse("bogus://whatever").unwrap();
@@ -1222,25 +1222,6 @@ impl HttpRequestFactory for DontConnectFactory {
}
}

#[test]
fn test_load_errors_when_scheme_is_not_http_or_https() {
let url = ServoUrl::parse("ftp://not-supported").unwrap();
let load_data = LoadData::new(LoadContext::Browsing, url.clone(), &HttpTest);

let http_state = HttpState::new();
let ui_provider = TestProvider::new();

match load(&load_data,
&ui_provider, &http_state,
None,
&DontConnectFactory,
DEFAULT_USER_AGENT.into(),
&CancellationListener::new(None), None) {
Err(ref load_err) if load_err.error == LoadErrorType::UnsupportedScheme { scheme: "ftp".into() } => (),
_ => panic!("expected ftp scheme to be unsupported")
}
}

#[test]
fn test_load_errors_when_viewing_source_and_inner_url_scheme_is_not_http_or_https() {
let url = ServoUrl::parse("view-source:ftp://not-supported").unwrap();
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.