Merge branch 'master' into fix-local-urls-only-10147

This commit is contained in:
Stjepan Glavina 2016-03-24 13:45:25 +01:00
commit 4965c93d16
37 changed files with 193 additions and 165 deletions

View file

@ -94,6 +94,20 @@ fn test_fetch_response_body_matches_const_message() {
};
}
#[test]
fn test_fetch_aboutblank() {
let url = Url::parse("about:blank").unwrap();
let origin = Origin::Origin(url.origin());
let mut request = Request::new(url, Some(origin), false);
request.referer = Referer::NoReferer;
let wrapped_request = Rc::new(request);
let fetch_response = fetch(wrapped_request);
assert!(!fetch_response.is_network_error());
assert!(*fetch_response.body.lock().unwrap() == ResponseBody::Done(vec![]));
}
#[test]
fn test_fetch_response_is_basic_filtered() {

View file

@ -14,6 +14,6 @@
</style>
</head>
<body>
<img class="ex" src="rust.png">
<img class="ex" src="rust-0.png">
</body>
</html>

View file

@ -13,6 +13,6 @@
</style>
</head>
<body>
<img class="ex" src="rust.png">
<img class="ex" src="rust-0.png">
</body>
</html>

View file

@ -1,4 +1,4 @@
@ecoal95
@emilio
@hallvors
@kangxu
@caitp