actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-07-01 16:55:08 +02:00
Code Issues Releases Wiki Activity

update actix-net dependencies

Browse Source
This commit is contained in:
Nikolay Kim
2019-05-12 08:34:51 -07:00
parent 4066375737
commit df08baf67f
43 changed files with 361 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/middleware/cors.rs
View File

@ -805,14 +805,15 @@ where
#[cfg(test)]
mod tests {
use actix_service::{FnService, Transform};
use actix_service::{IntoService, Transform};
use super::*;
use crate::test::{self, block_on, TestRequest};
impl Cors {
fn finish<S, B>(self, srv: S) -> CorsMiddleware<S>
fn finish<F, S, B>(self, srv: F) -> CorsMiddleware<S>
where
F: IntoService<S>,
S: Service<
Request = ServiceRequest,
Response = ServiceResponse<B>,
@ -822,7 +823,8 @@ mod tests {
B: 'static,
{
block_on(
IntoTransform::<CorsFactory, S>::into_transform(self).new_transform(srv),
IntoTransform::<CorsFactory, S>::into_transform(self)
.new_transform(srv.into_service()),
)
.unwrap()
}
@ -1063,11 +1065,11 @@ mod tests {
.allowed_headers(exposed_headers.clone())
.expose_headers(exposed_headers.clone())
.allowed_header(header::CONTENT_TYPE)
.finish(FnService::new(move |req: ServiceRequest| {
.finish(|req: ServiceRequest| {
req.into_response(
HttpResponse::Ok().header(header::VARY, "Accept").finish(),
)
}));
});
let req = TestRequest::with_header("Origin", "https://www.example.com")
.method(Method::OPTIONS)
.to_srv_request();

20
src/middleware/defaultheaders.rs
View File

@ -150,7 +150,7 @@ where
#[cfg(test)]
mod tests {
use actix_service::FnService;
use actix_service::IntoService;
use super::*;
use crate::dev::ServiceRequest;
@ -172,13 +172,13 @@ mod tests {
assert_eq!(resp.headers().get(CONTENT_TYPE).unwrap(), "0001");
let req = TestRequest::default().to_srv_request();
let srv = FnService::new(|req: ServiceRequest| {
let srv = |req: ServiceRequest| {
req.into_response(HttpResponse::Ok().header(CONTENT_TYPE, "0002").finish())
});
};
let mut mw = block_on(
DefaultHeaders::new()
.header(CONTENT_TYPE, "0001")
.new_transform(srv),
.new_transform(srv.into_service()),
)
.unwrap();
let resp = block_on(mw.call(req)).unwrap();
@ -187,11 +187,13 @@ mod tests {
#[test]
fn test_content_type() {
let srv = FnService::new(|req: ServiceRequest| {
req.into_response(HttpResponse::Ok().finish())
});
let mut mw =
block_on(DefaultHeaders::new().content_type().new_transform(srv)).unwrap();
let srv = |req: ServiceRequest| req.into_response(HttpResponse::Ok().finish());
let mut mw = block_on(
DefaultHeaders::new()
.content_type()
.new_transform(srv.into_service()),
)
.unwrap();
let req = TestRequest::default().to_srv_request();
let resp = block_on(mw.call(req)).unwrap();

14
src/middleware/errhandlers.rs
View File

@ -142,7 +142,7 @@ where
#[cfg(test)]
mod tests {
use actix_service::FnService;
use actix_service::IntoService;
use futures::future::ok;
use super::*;
@ -159,14 +159,14 @@ mod tests {
#[test]
fn test_handler() {
let srv = FnService::new(|req: ServiceRequest| {
let srv = |req: ServiceRequest| {
req.into_response(HttpResponse::InternalServerError().finish())
});
};
let mut mw = test::block_on(
ErrorHandlers::new()
.handler(StatusCode::INTERNAL_SERVER_ERROR, render_500)
.new_transform(srv),
.new_transform(srv.into_service()),
)
.unwrap();
@ -185,14 +185,14 @@ mod tests {
#[test]
fn test_handler_async() {
let srv = FnService::new(|req: ServiceRequest| {
let srv = |req: ServiceRequest| {
req.into_response(HttpResponse::InternalServerError().finish())
});
};
let mut mw = test::block_on(
ErrorHandlers::new()
.handler(StatusCode::INTERNAL_SERVER_ERROR, render_500_async)
.new_transform(srv),
.new_transform(srv.into_service()),
)
.unwrap();

8
src/middleware/logger.rs
View File

@ -457,7 +457,7 @@ impl<'a> fmt::Display for FormatDisplay<'a> {
#[cfg(test)]
mod tests {
use actix_service::{FnService, Service, Transform};
use actix_service::{IntoService, Service, Transform};
use super::*;
use crate::http::{header, StatusCode};
@ -465,16 +465,16 @@ mod tests {
#[test]
fn test_logger() {
let srv = FnService::new(|req: ServiceRequest| {
let srv = |req: ServiceRequest| {
req.into_response(
HttpResponse::build(StatusCode::OK)
.header("X-Test", "ttt")
.finish(),
)
});
};
let logger = Logger::new("%% %{User-Agent}i %{X-Test}o %{HOME}e %D test");
let mut srv = block_on(logger.new_transform(srv)).unwrap();
let mut srv = block_on(logger.new_transform(srv.into_service())).unwrap();
let req = TestRequest::with_header(
header::USER_AGENT,

16
src/middleware/normalize.rs
View File

@ -100,7 +100,7 @@ where
#[cfg(test)]
mod tests {
use actix_service::FnService;
use actix_service::IntoService;
use super::*;
use crate::dev::ServiceRequest;
@ -122,12 +122,13 @@ mod tests {
#[test]
fn test_in_place_normalization() {
let srv = FnService::new(|req: ServiceRequest| {
let srv = |req: ServiceRequest| {
assert_eq!("/v1/something/", req.path());
req.into_response(HttpResponse::Ok().finish())
});
};
let mut normalize = block_on(NormalizePath.new_transform(srv)).unwrap();
let mut normalize =
block_on(NormalizePath.new_transform(srv.into_service())).unwrap();
let req = TestRequest::with_uri("/v1//something////").to_srv_request();
let res = block_on(normalize.call(req)).unwrap();
@ -138,12 +139,13 @@ mod tests {
fn should_normalize_nothing() {
const URI: &str = "/v1/something/";
let srv = FnService::new(|req: ServiceRequest| {
let srv = |req: ServiceRequest| {
assert_eq!(URI, req.path());
req.into_response(HttpResponse::Ok().finish())
});
};
let mut normalize = block_on(NormalizePath.new_transform(srv)).unwrap();
let mut normalize =
block_on(NormalizePath.new_transform(srv.into_service())).unwrap();
let req = TestRequest::with_uri(URI).to_srv_request();
let res = block_on(normalize.call(req)).unwrap();