mirrors/ntex-extras
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex-extras.git synced 2025-04-05 05:47:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

update error usage

Browse source
This commit is contained in:
Nikolay Kim 2020-04-12 03:08:22 +06:00
parent 3f7ae1ccb6
commit 062aceb570
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ntex-cors/src/lib.rs
View file

@ -711,10 +711,7 @@ where
.and_then(|_| self.inner.validate_allowed_method(req.head())) .and_then(|_| self.inner.validate_allowed_method(req.head()))
.and_then(|_| self.inner.validate_allowed_headers(req.head())) .and_then(|_| self.inner.validate_allowed_headers(req.head()))
{ {
return Either::Left(ok(req.into_response( return Either::Left(ok(req.render_error(e)));
WebResponseError::error_response(&e)
.map_body(|_, body| body.into_body()),
)));
} }
// allowed headers // allowed headers
@ -772,10 +769,7 @@ where
if req.headers().contains_key(&header::ORIGIN) { if req.headers().contains_key(&header::ORIGIN) {
// Only check requests with a origin header. // Only check requests with a origin header.
if let Err(e) = self.inner.validate_origin(req.head()) { if let Err(e) = self.inner.validate_origin(req.head()) {
return Either::Left(ok(req.into_response( return Either::Left(ok(req.render_error(e)));
WebResponseError::error_response(&e)
.map_body(|_, body| body.into_body()),
)));
} }
} }

4
ntex-multipart/src/error.rs
View file

@ -45,11 +45,13 @@ impl WebResponseError<DefaultError> for MultipartError {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use ntex::web::test::TestRequest;
use ntex::web::HttpResponse; use ntex::web::HttpResponse;
#[test] #[test]
fn test_multipart_error() { fn test_multipart_error() {
let resp: HttpResponse = MultipartError::Boundary.error_response(); let req = TestRequest::default().to_http_request();
let resp: HttpResponse = MultipartError::Boundary.error_response(&req);
assert_eq!(resp.status(), StatusCode::BAD_REQUEST); assert_eq!(resp.status(), StatusCode::BAD_REQUEST);
} }
} }