mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-12-30 03:50:42 +00:00
Code Issues Projects Releases Wiki Activity

use test::call_service

Browse source
This commit is contained in:
Nikolay Kim 2019-04-15 09:09:21 -07:00
parent 7a28b32f6d
commit 14252f5ef2
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
actix-files/src/lib.rs
View file

@ -775,7 +775,7 @@ mod tests {
); );
let request = TestRequest::get().uri("/").to_request(); let request = TestRequest::get().uri("/").to_request();
let response = test::call_success(&mut srv, request); let response = test::call_service(&mut srv, request);
assert_eq!(response.status(), StatusCode::OK); assert_eq!(response.status(), StatusCode::OK);
let content_disposition = response let content_disposition = response
@ -799,7 +799,7 @@ mod tests {
.uri("/t%65st/Cargo.toml") .uri("/t%65st/Cargo.toml")
.header(header::RANGE, "bytes=10-20") .header(header::RANGE, "bytes=10-20")
.to_request(); .to_request();
let response = test::call_success(&mut srv, request); let response = test::call_service(&mut srv, request);
assert_eq!(response.status(), StatusCode::PARTIAL_CONTENT); assert_eq!(response.status(), StatusCode::PARTIAL_CONTENT);
// Invalid range header // Invalid range header
@ -807,7 +807,7 @@ mod tests {
.uri("/t%65st/Cargo.toml") .uri("/t%65st/Cargo.toml")
.header(header::RANGE, "bytes=1-0") .header(header::RANGE, "bytes=1-0")
.to_request(); .to_request();
let response = test::call_success(&mut srv, request); let response = test::call_service(&mut srv, request);
assert_eq!(response.status(), StatusCode::RANGE_NOT_SATISFIABLE); assert_eq!(response.status(), StatusCode::RANGE_NOT_SATISFIABLE);
} }
@ -824,7 +824,7 @@ mod tests {
.header(header::RANGE, "bytes=10-20") .header(header::RANGE, "bytes=10-20")
.to_request(); .to_request();
let response = test::call_success(&mut srv, request); let response = test::call_service(&mut srv, request);
let contentrange = response let contentrange = response
.headers() .headers()
.get(header::CONTENT_RANGE) .get(header::CONTENT_RANGE)
@ -839,7 +839,7 @@ mod tests {
.uri("/t%65st/tests/test.binary") .uri("/t%65st/tests/test.binary")
.header(header::RANGE, "bytes=10-5") .header(header::RANGE, "bytes=10-5")
.to_request(); .to_request();
let response = test::call_success(&mut srv, request); let response = test::call_service(&mut srv, request);
let contentrange = response let contentrange = response
.headers() .headers()
@ -862,7 +862,7 @@ mod tests {
.uri("/t%65st/tests/test.binary") .uri("/t%65st/tests/test.binary")
.header(header::RANGE, "bytes=10-20") .header(header::RANGE, "bytes=10-20")
.to_request(); .to_request();
let response = test::call_success(&mut srv, request); let response = test::call_service(&mut srv, request);
let contentlength = response let contentlength = response
.headers() .headers()
@ -878,7 +878,7 @@ mod tests {
.uri("/t%65st/tests/test.binary") .uri("/t%65st/tests/test.binary")
.header(header::RANGE, "bytes=10-8") .header(header::RANGE, "bytes=10-8")
.to_request(); .to_request();
let response = test::call_success(&mut srv, request); let response = test::call_service(&mut srv, request);
assert_eq!(response.status(), StatusCode::RANGE_NOT_SATISFIABLE); assert_eq!(response.status(), StatusCode::RANGE_NOT_SATISFIABLE);
// Without range header // Without range header
@ -886,7 +886,7 @@ mod tests {
.uri("/t%65st/tests/test.binary") .uri("/t%65st/tests/test.binary")
// .no_default_headers() // .no_default_headers()
.to_request(); .to_request();
let response = test::call_success(&mut srv, request); let response = test::call_service(&mut srv, request);
let contentlength = response let contentlength = response
.headers() .headers()
@ -901,7 +901,7 @@ mod tests {
let request = TestRequest::get() let request = TestRequest::get()
.uri("/t%65st/tests/test.binary") .uri("/t%65st/tests/test.binary")
.to_request(); .to_request();
let mut response = test::call_success(&mut srv, request); let mut response = test::call_service(&mut srv, request);
// with enabled compression // with enabled compression
// { // {
@ -932,7 +932,7 @@ mod tests {
let request = TestRequest::get() let request = TestRequest::get()
.uri("/tests/test%20space.binary") .uri("/tests/test%20space.binary")
.to_request(); .to_request();
let mut response = test::call_success(&mut srv, request); let mut response = test::call_service(&mut srv, request);
assert_eq!(response.status(), StatusCode::OK); assert_eq!(response.status(), StatusCode::OK);
let bytes = let bytes =
@ -975,7 +975,7 @@ mod tests {
.uri("/") .uri("/")
.header(header::ACCEPT_ENCODING, "gzip") .header(header::ACCEPT_ENCODING, "gzip")
.to_request(); .to_request();
let res = test::call_success(&mut srv, request); let res = test::call_service(&mut srv, request);
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
assert!(!res.headers().contains_key(header::CONTENT_ENCODING)); assert!(!res.headers().contains_key(header::CONTENT_ENCODING));
} }
@ -994,7 +994,7 @@ mod tests {
.uri("/") .uri("/")
.header(header::ACCEPT_ENCODING, "gzip") .header(header::ACCEPT_ENCODING, "gzip")
.to_request(); .to_request();
let res = test::call_success(&mut srv, request); let res = test::call_service(&mut srv, request);
assert_eq!(res.status(), StatusCode::OK); assert_eq!(res.status(), StatusCode::OK);
assert_eq!( assert_eq!(
res.headers() res.headers()
@ -1021,20 +1021,20 @@ mod tests {
); );
let req = TestRequest::with_uri("/missing").to_request(); let req = TestRequest::with_uri("/missing").to_request();
let resp = test::call_success(&mut srv, req); let resp = test::call_service(&mut srv, req);
assert_eq!(resp.status(), StatusCode::NOT_FOUND); assert_eq!(resp.status(), StatusCode::NOT_FOUND);
let mut srv = test::init_service(App::new().service(Files::new("/", "."))); let mut srv = test::init_service(App::new().service(Files::new("/", ".")));
let req = TestRequest::default().to_request(); let req = TestRequest::default().to_request();
let resp = test::call_success(&mut srv, req); let resp = test::call_service(&mut srv, req);
assert_eq!(resp.status(), StatusCode::NOT_FOUND); assert_eq!(resp.status(), StatusCode::NOT_FOUND);
let mut srv = test::init_service( let mut srv = test::init_service(
App::new().service(Files::new("/", ".").show_files_listing()), App::new().service(Files::new("/", ".").show_files_listing()),
); );
let req = TestRequest::with_uri("/tests").to_request(); let req = TestRequest::with_uri("/tests").to_request();
let mut resp = test::call_success(&mut srv, req); let mut resp = test::call_service(&mut srv, req);
assert_eq!( assert_eq!(
resp.headers().get(header::CONTENT_TYPE).unwrap(), resp.headers().get(header::CONTENT_TYPE).unwrap(),
"text/html; charset=utf-8" "text/html; charset=utf-8"
@ -1067,7 +1067,7 @@ mod tests {
.unwrap(); .unwrap();
let req = TestRequest::with_uri("/missing").to_srv_request(); let req = TestRequest::with_uri("/missing").to_srv_request();
let mut resp = test::call_success(&mut st, req); let mut resp = test::call_service(&mut st, req);
assert_eq!(resp.status(), StatusCode::OK); assert_eq!(resp.status(), StatusCode::OK);
let bytes = let bytes =
test::block_on(resp.take_body().fold(BytesMut::new(), |mut b, c| { test::block_on(resp.take_body().fold(BytesMut::new(), |mut b, c| {

4
actix-web-actors/src/context.rs
View file

@ -199,7 +199,7 @@ mod tests {
use actix::Actor; use actix::Actor;
use actix_web::http::StatusCode; use actix_web::http::StatusCode;
use actix_web::test::{block_on, call_success, init_service, TestRequest}; use actix_web::test::{block_on, call_service, init_service, TestRequest};
use actix_web::{web, App, HttpResponse}; use actix_web::{web, App, HttpResponse};
use bytes::{Bytes, BytesMut}; use bytes::{Bytes, BytesMut};
@ -237,7 +237,7 @@ mod tests {
}))); })));
let req = TestRequest::with_uri("/test").to_request(); let req = TestRequest::with_uri("/test").to_request();
let mut resp = call_success(&mut srv, req); let mut resp = call_service(&mut srv, req);
assert_eq!(resp.status(), StatusCode::OK); assert_eq!(resp.status(), StatusCode::OK);
let body = block_on(resp.take_body().fold( let body = block_on(resp.take_body().fold(