Introduce fetch_with_cors_cache() API for tests.

This commit is contained in:
Ms2ger 2016-12-02 12:16:27 +01:00
parent 306905a631
commit 6f2606cdee
2 changed files with 15 additions and 5 deletions

View file

@ -36,6 +36,7 @@ extern crate url;
use devtools_traits::DevtoolsControlMsg;
use hyper::server::{Handler, Listening, Server};
use net::fetch::cors_cache::CorsCache;
use net::fetch::methods::{self, FetchContext};
use net::filemanager_thread::FileManager;
use net::test::HttpState;
@ -86,6 +87,17 @@ fn fetch_with_context(request: Request, context: &FetchContext) -> Response {
receiver.recv().unwrap()
}
fn fetch_with_cors_cache(request: Rc<Request>, cache: &mut CorsCache) -> Response {
let (sender, receiver) = channel();
let target = Box::new(FetchResponseCollector {
sender: sender,
});
methods::fetch_with_cors_cache(request, cache, &mut Some(target), &new_fetch_context(None));
receiver.recv().unwrap()
}
fn make_server<H: Handler + 'static>(handler: H) -> (Listening, ServoUrl) {
// this is a Listening server because of handle_threads()
let server = Server::http("0.0.0.0:0").unwrap().handle_threads(handler, 1).unwrap();