mirror of
https://github.com/actix/actix-web.git
synced 2024-12-22 16:16:40 +00:00
Merge pull request #314 from DJMcNab/app-cleanup
remove duplication of `App::with_state` in `App::new`
This commit is contained in:
commit
8a8e6add08
1 changed files with 24 additions and 22 deletions
|
@ -192,20 +192,7 @@ impl App<()> {
|
||||||
/// Create application with empty state. Application can
|
/// Create application with empty state. Application can
|
||||||
/// be configured with a builder-like pattern.
|
/// be configured with a builder-like pattern.
|
||||||
pub fn new() -> App<()> {
|
pub fn new() -> App<()> {
|
||||||
App {
|
App::with_state(())
|
||||||
parts: Some(ApplicationParts {
|
|
||||||
state: (),
|
|
||||||
prefix: "/".to_owned(),
|
|
||||||
settings: ServerSettings::default(),
|
|
||||||
default: ResourceHandler::default_not_found(),
|
|
||||||
resources: Vec::new(),
|
|
||||||
handlers: Vec::new(),
|
|
||||||
external: HashMap::new(),
|
|
||||||
encoding: ContentEncoding::Auto,
|
|
||||||
filters: Vec::new(),
|
|
||||||
middlewares: Vec::new(),
|
|
||||||
}),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -737,7 +724,7 @@ impl<S: 'static> Iterator for App<S> {
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
use body::{Body, Binary};
|
use body::{Binary, Body};
|
||||||
use http::StatusCode;
|
use http::StatusCode;
|
||||||
use httprequest::HttpRequest;
|
use httprequest::HttpRequest;
|
||||||
use httpresponse::HttpResponse;
|
use httpresponse::HttpResponse;
|
||||||
|
@ -811,7 +798,9 @@ mod tests {
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_handler() {
|
fn test_handler() {
|
||||||
let mut app = App::new().handler("/test", |_| HttpResponse::Ok()).finish();
|
let mut app = App::new()
|
||||||
|
.handler("/test", |_| HttpResponse::Ok())
|
||||||
|
.finish();
|
||||||
|
|
||||||
let req = TestRequest::with_uri("/test").finish();
|
let req = TestRequest::with_uri("/test").finish();
|
||||||
let resp = app.run(req);
|
let resp = app.run(req);
|
||||||
|
@ -836,7 +825,9 @@ mod tests {
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_handler2() {
|
fn test_handler2() {
|
||||||
let mut app = App::new().handler("test", |_| HttpResponse::Ok()).finish();
|
let mut app = App::new()
|
||||||
|
.handler("test", |_| HttpResponse::Ok())
|
||||||
|
.finish();
|
||||||
|
|
||||||
let req = TestRequest::with_uri("/test").finish();
|
let req = TestRequest::with_uri("/test").finish();
|
||||||
let resp = app.run(req);
|
let resp = app.run(req);
|
||||||
|
@ -890,21 +881,29 @@ mod tests {
|
||||||
#[test]
|
#[test]
|
||||||
fn test_route() {
|
fn test_route() {
|
||||||
let mut app = App::new()
|
let mut app = App::new()
|
||||||
.route("/test", Method::GET, |_: HttpRequest| HttpResponse::Ok())
|
.route("/test", Method::GET, |_: HttpRequest| {
|
||||||
|
HttpResponse::Ok()
|
||||||
|
})
|
||||||
.route("/test", Method::POST, |_: HttpRequest| {
|
.route("/test", Method::POST, |_: HttpRequest| {
|
||||||
HttpResponse::Created()
|
HttpResponse::Created()
|
||||||
})
|
})
|
||||||
.finish();
|
.finish();
|
||||||
|
|
||||||
let req = TestRequest::with_uri("/test").method(Method::GET).finish();
|
let req = TestRequest::with_uri("/test")
|
||||||
|
.method(Method::GET)
|
||||||
|
.finish();
|
||||||
let resp = app.run(req);
|
let resp = app.run(req);
|
||||||
assert_eq!(resp.as_msg().status(), StatusCode::OK);
|
assert_eq!(resp.as_msg().status(), StatusCode::OK);
|
||||||
|
|
||||||
let req = TestRequest::with_uri("/test").method(Method::POST).finish();
|
let req = TestRequest::with_uri("/test")
|
||||||
|
.method(Method::POST)
|
||||||
|
.finish();
|
||||||
let resp = app.run(req);
|
let resp = app.run(req);
|
||||||
assert_eq!(resp.as_msg().status(), StatusCode::CREATED);
|
assert_eq!(resp.as_msg().status(), StatusCode::CREATED);
|
||||||
|
|
||||||
let req = TestRequest::with_uri("/test").method(Method::HEAD).finish();
|
let req = TestRequest::with_uri("/test")
|
||||||
|
.method(Method::HEAD)
|
||||||
|
.finish();
|
||||||
let resp = app.run(req);
|
let resp = app.run(req);
|
||||||
assert_eq!(resp.as_msg().status(), StatusCode::NOT_FOUND);
|
assert_eq!(resp.as_msg().status(), StatusCode::NOT_FOUND);
|
||||||
}
|
}
|
||||||
|
@ -973,6 +972,9 @@ mod tests {
|
||||||
let req = TestRequest::with_uri("/some").finish();
|
let req = TestRequest::with_uri("/some").finish();
|
||||||
let resp = app.run(req);
|
let resp = app.run(req);
|
||||||
assert_eq!(resp.as_msg().status(), StatusCode::OK);
|
assert_eq!(resp.as_msg().status(), StatusCode::OK);
|
||||||
assert_eq!(resp.as_msg().body(), &Body::Binary(Binary::Slice(b"some")));
|
assert_eq!(
|
||||||
|
resp.as_msg().body(),
|
||||||
|
&Body::Binary(Binary::Slice(b"some"))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue