Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions src/response.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ impl ErrorResponse {
/// use http::StatusCode;
/// use masterror::{AppCode, ErrorResponse};
///
/// let resp = ErrorResponse::new(404, AppCode::NotFound, "missing");
/// let resp = ErrorResponse::new(404, AppCode::NotFound, "missing").expect("status");
/// assert_eq!(resp.status_code(), StatusCode::NOT_FOUND);
/// ```
#[must_use]
Expand Down Expand Up @@ -315,7 +315,10 @@ mod actix_impl {
use actix_web::{
HttpRequest, HttpResponse, Responder,
body::BoxBody,
http::header::{RETRY_AFTER, WWW_AUTHENTICATE}
http::{
StatusCode as ActixStatus,
header::{RETRY_AFTER, WWW_AUTHENTICATE}
}
};

use super::ErrorResponse;
Expand All @@ -325,6 +328,8 @@ mod actix_impl {

fn respond_to(self, _req: &HttpRequest) -> HttpResponse {
let status = self.status_code();
let status = ActixStatus::from_u16(status.as_u16())
.unwrap_or(ActixStatus::INTERNAL_SERVER_ERROR);

let mut builder = HttpResponse::build(status);
if let Some(retry) = self.retry {
Expand Down Expand Up @@ -377,10 +382,17 @@ mod tests {
fn status_code_maps_invalid_to_internal_server_error() {
use http::StatusCode;

let valid = ErrorResponse::new(404, AppCode::NotFound, "missing");
let valid = ErrorResponse::new(404, AppCode::NotFound, "missing").expect("status");
assert_eq!(valid.status_code(), StatusCode::NOT_FOUND);

let invalid = ErrorResponse::new(1000, AppCode::Internal, "oops");
let invalid = ErrorResponse {
status: 1000,
code: AppCode::Internal,
message: "oops".into(),
details: None,
retry: None,
www_authenticate: None
};
assert_eq!(invalid.status_code(), StatusCode::INTERNAL_SERVER_ERROR);
}

Expand Down
Loading