mirror of https://github.com/rwf2/Rocket.git
Address feedback for templating tests
This commit is contained in:
parent
b30e527e1e
commit
b602bbfe34
|
@ -3,6 +3,7 @@ use rocket::testing::MockRequest;
|
||||||
use rocket::http::Method::*;
|
use rocket::http::Method::*;
|
||||||
use rocket::http::Status;
|
use rocket::http::Status;
|
||||||
use rocket::Response;
|
use rocket::Response;
|
||||||
|
use rocket_contrib::Template;
|
||||||
|
|
||||||
macro_rules! run_test {
|
macro_rules! run_test {
|
||||||
($req:expr, $test_fn:expr) => ({
|
($req:expr, $test_fn:expr) => ({
|
||||||
|
@ -17,29 +18,31 @@ macro_rules! run_test {
|
||||||
#[test]
|
#[test]
|
||||||
fn test_root() {
|
fn test_root() {
|
||||||
// Check that the redirect works.
|
// Check that the redirect works.
|
||||||
for method in [Get, Head].iter() {
|
for method in vec![Get, Head].into_iter() {
|
||||||
let mut req = MockRequest::new(*method, "/");
|
let mut req = MockRequest::new(method, "/");
|
||||||
run_test!(req, |mut response: Response| {
|
run_test!(req, |mut response: Response| {
|
||||||
assert_eq!(response.status(), Status::SeeOther);
|
assert_eq!(response.status(), Status::SeeOther);
|
||||||
|
|
||||||
assert!(response.body().is_none());
|
assert!(response.body().is_none());
|
||||||
|
|
||||||
let location_headers: Vec<_> = response.header_values("Location").collect();
|
let location_headers: Vec<_> = response.header_values("Location").collect();
|
||||||
let content_length: Vec<_> = response.header_values("Content-Length").collect();
|
|
||||||
|
|
||||||
assert_eq!(location_headers, vec!["/hello/Unknown"]);
|
assert_eq!(location_headers, vec!["/hello/Unknown"]);
|
||||||
assert_eq!(content_length, vec!["0"]);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check that other request methods are not accepted (and instead caught).
|
// Check that other request methods are not accepted (and instead caught).
|
||||||
for method in [Post, Put, Delete, Options, Trace, Connect, Patch].iter() {
|
for method in vec![Post, Put, Delete, Options, Trace, Connect, Patch].into_iter() {
|
||||||
let mut req = MockRequest::new(*method, "/");
|
let mut req = MockRequest::new(method, "/");
|
||||||
run_test!(req, |mut response: Response| {
|
run_test!(req, |mut response: Response| {
|
||||||
assert_eq!(response.status(), Status::NotFound);
|
assert_eq!(response.status(), Status::NotFound);
|
||||||
|
|
||||||
|
let mut map = ::std::collections::HashMap::new();
|
||||||
|
map.insert("path", "/");
|
||||||
|
let expected = Template::render("error/404", &map).to_string();
|
||||||
|
|
||||||
let body_string = response.body().and_then(|body| body.into_string());
|
let body_string = response.body().and_then(|body| body.into_string());
|
||||||
assert_eq!(body_string, Some("<!DOCTYPE html>\n<html>\n <head>\n <meta charset=\"utf-8\" />\n <title>404</title>\n </head>\n <body>\n <h1>404: Hey! There\'s nothing here.</h1>\n The page at / does not exist!\n </body>\n</html>\n".to_string()));
|
assert_eq!(body_string, Some(expected));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -51,8 +54,14 @@ fn test_name() {
|
||||||
run_test!(req, |mut response: Response| {
|
run_test!(req, |mut response: Response| {
|
||||||
assert_eq!(response.status(), Status::Ok);
|
assert_eq!(response.status(), Status::Ok);
|
||||||
|
|
||||||
|
let context = super::TemplateContext {
|
||||||
|
name: "Jack".to_string(),
|
||||||
|
items: vec!["One", "Two", "Three"].iter().map(|s| s.to_string()).collect()
|
||||||
|
};
|
||||||
|
let expected = Template::render("index", &context).to_string();
|
||||||
|
|
||||||
let body_string = response.body().and_then(|body| body.into_string());
|
let body_string = response.body().and_then(|body| body.into_string());
|
||||||
assert_eq!(body_string, Some("<!DOCTYPE html>\n<html>\n <head>\n <meta charset=\"utf-8\" />\n <title>Handlebars Demo</title>\n </head>\n <body>\n <h1>Hi Jack</h1>\n <h3>Here are your items:</h3>\n <ul>\n \n <li>One</li>\n \n <li>Two</li>\n \n <li>Three</li>\n \n </ul>\n\n <p>Try going to <a href=\"/hello/YourName\">/hello/YourName</a></p>\n </body>\n</html>\n".to_string()));
|
assert_eq!(body_string, Some(expected));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -63,7 +72,11 @@ fn test_404() {
|
||||||
run_test!(req, |mut response: Response| {
|
run_test!(req, |mut response: Response| {
|
||||||
assert_eq!(response.status(), Status::NotFound);
|
assert_eq!(response.status(), Status::NotFound);
|
||||||
|
|
||||||
|
let mut map = ::std::collections::HashMap::new();
|
||||||
|
map.insert("path", "/hello/");
|
||||||
|
let expected = Template::render("error/404", &map).to_string();
|
||||||
|
|
||||||
let body_string = response.body().and_then(|body| body.into_string());
|
let body_string = response.body().and_then(|body| body.into_string());
|
||||||
assert_eq!(body_string, Some("<!DOCTYPE html>\n<html>\n <head>\n <meta charset=\"utf-8\" />\n <title>404</title>\n </head>\n <body>\n <h1>404: Hey! There\'s nothing here.</h1>\n The page at /hello/ does not exist!\n </body>\n</html>\n".to_string()));
|
assert_eq!(body_string, Some(expected));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue