mirror of
https://github.com/actix/actix-web.git
synced 2024-11-26 11:31:09 +00:00
add tests for ErrorXXX helpers
This commit is contained in:
parent
5f5ddc8f01
commit
76f021a6e3
3 changed files with 50 additions and 4 deletions
|
@ -4,6 +4,8 @@
|
||||||
|
|
||||||
* Add `Router::with_async()` method for async handler registration.
|
* Add `Router::with_async()` method for async handler registration.
|
||||||
|
|
||||||
|
* Added error response functions for 501,502,503,504
|
||||||
|
|
||||||
|
|
||||||
## 0.6.2 (2018-05-09)
|
## 0.6.2 (2018-05-09)
|
||||||
|
|
||||||
|
|
2
build.rs
2
build.rs
|
@ -1,8 +1,6 @@
|
||||||
extern crate version_check;
|
extern crate version_check;
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
let mut has_impl_trait = true;
|
|
||||||
|
|
||||||
match version_check::is_min_version("1.26.0") {
|
match version_check::is_min_version("1.26.0") {
|
||||||
Some((true, _)) => println!("cargo:rustc-cfg=actix_impl_trait"),
|
Some((true, _)) => println!("cargo:rustc-cfg=actix_impl_trait"),
|
||||||
_ => (),
|
_ => (),
|
||||||
|
|
50
src/error.rs
50
src/error.rs
|
@ -777,7 +777,6 @@ where
|
||||||
InternalError::new(err, StatusCode::BAD_GATEWAY).into()
|
InternalError::new(err, StatusCode::BAD_GATEWAY).into()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// Helper function that creates wrapper of any error and
|
/// Helper function that creates wrapper of any error and
|
||||||
/// generate *SERVICE UNAVAILABLE* response.
|
/// generate *SERVICE UNAVAILABLE* response.
|
||||||
#[allow(non_snake_case)]
|
#[allow(non_snake_case)]
|
||||||
|
@ -798,7 +797,6 @@ where
|
||||||
InternalError::new(err, StatusCode::GATEWAY_TIMEOUT).into()
|
InternalError::new(err, StatusCode::GATEWAY_TIMEOUT).into()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
@ -954,4 +952,52 @@ mod tests {
|
||||||
let resp: HttpResponse = err.error_response();
|
let resp: HttpResponse = err.error_response();
|
||||||
assert_eq!(resp.status(), StatusCode::OK);
|
assert_eq!(resp.status(), StatusCode::OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_error_helpers() {
|
||||||
|
let r: HttpResponse = ErrorBadRequest("err").into();
|
||||||
|
assert_eq!(r.status(), StatusCode::BAD_REQUEST);
|
||||||
|
|
||||||
|
let r: HttpResponse = ErrorUnauthorized("err").into();
|
||||||
|
assert_eq!(r.status(), StatusCode::UNAUTHORIZED);
|
||||||
|
|
||||||
|
let r: HttpResponse = ErrorForbidden("err").into();
|
||||||
|
assert_eq!(r.status(), StatusCode::FORBIDDEN);
|
||||||
|
|
||||||
|
let r: HttpResponse = ErrorNotFound("err").into();
|
||||||
|
assert_eq!(r.status(), StatusCode::NOT_FOUND);
|
||||||
|
|
||||||
|
let r: HttpResponse = ErrorMethodNotAllowed("err").into();
|
||||||
|
assert_eq!(r.status(), StatusCode::METHOD_NOT_ALLOWED);
|
||||||
|
|
||||||
|
let r: HttpResponse = ErrorRequestTimeout("err").into();
|
||||||
|
assert_eq!(r.status(), StatusCode::REQUEST_TIMEOUT);
|
||||||
|
|
||||||
|
let r: HttpResponse = ErrorConflict("err").into();
|
||||||
|
assert_eq!(r.status(), StatusCode::CONFLICT);
|
||||||
|
|
||||||
|
let r: HttpResponse = ErrorGone("err").into();
|
||||||
|
assert_eq!(r.status(), StatusCode::GONE);
|
||||||
|
|
||||||
|
let r: HttpResponse = ErrorPreconditionFailed("err").into();
|
||||||
|
assert_eq!(r.status(), StatusCode::PRECONDITION_FAILED);
|
||||||
|
|
||||||
|
let r: HttpResponse = ErrorExpectationFailed("err").into();
|
||||||
|
assert_eq!(r.status(), StatusCode::EXPECTATION_FAILED);
|
||||||
|
|
||||||
|
let r: HttpResponse = ErrorInternalServerError("err").into();
|
||||||
|
assert_eq!(r.status(), StatusCode::INTERNAL_SERVER_ERROR);
|
||||||
|
|
||||||
|
let r: HttpResponse = ErrorNotImplemented("err").into();
|
||||||
|
assert_eq!(r.status(), StatusCode::NOT_IMPLEMENTED);
|
||||||
|
|
||||||
|
let r: HttpResponse = ErrorBadGateway("err").into();
|
||||||
|
assert_eq!(r.status(), StatusCode::BAD_GATEWAY);
|
||||||
|
|
||||||
|
let r: HttpResponse = ErrorServiceUnavailable("err").into();
|
||||||
|
assert_eq!(r.status(), StatusCode::SERVICE_UNAVAILABLE);
|
||||||
|
|
||||||
|
let r: HttpResponse = ErrorGatewayTimeout("err").into();
|
||||||
|
assert_eq!(r.status(), StatusCode::GATEWAY_TIMEOUT);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue