mirror of https://github.com/rwf2/Rocket.git
Fix conditional compilation for contrib templates tests.
This commit is contained in:
parent
1e8e4cc553
commit
397a646dcf
|
@ -1,28 +1,30 @@
|
|||
extern crate rocket;
|
||||
extern crate rocket_contrib;
|
||||
|
||||
use std::env;
|
||||
use std::path::PathBuf;
|
||||
#[cfg(feature = "templates")]
|
||||
mod templates_tests {
|
||||
use std::env;
|
||||
use std::path::PathBuf;
|
||||
|
||||
use rocket::Rocket;
|
||||
use rocket::config::{Config, Environment};
|
||||
use rocket_contrib::Template;
|
||||
use rocket::Rocket;
|
||||
use rocket::config::{Config, Environment};
|
||||
use rocket_contrib::Template;
|
||||
|
||||
fn template_root() -> PathBuf {
|
||||
fn template_root() -> PathBuf {
|
||||
let cwd = env::current_dir().expect("current working directory");
|
||||
cwd.join("tests").join("templates")
|
||||
}
|
||||
}
|
||||
|
||||
fn rocket() -> Rocket {
|
||||
fn rocket() -> Rocket {
|
||||
let config = Config::build(Environment::Development)
|
||||
.extra("template_dir", template_root().to_str().expect("template directory"))
|
||||
.expect("valid configuration");
|
||||
|
||||
rocket::custom(config, true).attach(Template::fairing())
|
||||
}
|
||||
::rocket::custom(config, true).attach(Template::fairing())
|
||||
}
|
||||
|
||||
#[cfg(feature = "tera_templates")]
|
||||
mod tera_tests {
|
||||
#[cfg(feature = "tera_templates")]
|
||||
mod tera_tests {
|
||||
use super::*;
|
||||
use std::collections::HashMap;
|
||||
|
||||
|
@ -46,10 +48,10 @@ mod tera_tests {
|
|||
let template = Template::show(&rocket, "tera/html_test", &map);
|
||||
assert_eq!(template, Some(ESCAPED_EXPECTED.into()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "handlebars_templates")]
|
||||
mod handlebars_tests {
|
||||
#[cfg(feature = "handlebars_templates")]
|
||||
mod handlebars_tests {
|
||||
use super::*;
|
||||
use std::collections::HashMap;
|
||||
|
||||
|
@ -67,5 +69,5 @@ mod handlebars_tests {
|
|||
let template = Template::show(&rocket, "hbs/test", &map);
|
||||
assert_eq!(template, Some(EXPECTED.into()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue