rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the tests for latest changes.

This commit is contained in:
Sergio Benitez 2016-11-04 15:11:59 +01:00
parent d7353c8c2d
commit 4d189df884
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/src/config/mod.rs
View File

@ -537,7 +537,7 @@ mod test {
assert!(RocketConfig::parse(r#" assert!(RocketConfig::parse(r#"
[development] [development]
address = "_idk_?" address = "!_idk_?"
"#.to_string(), TEST_CONFIG_FILENAME).is_err()); "#.to_string(), TEST_CONFIG_FILENAME).is_err());
assert!(RocketConfig::parse(r#" assert!(RocketConfig::parse(r#"
@ -547,7 +547,7 @@ mod test {
assert!(RocketConfig::parse(r#" assert!(RocketConfig::parse(r#"
[production] [production]
address = "1.2.3.4.5.6" address = "!@#$%^&*()"
"#.to_string(), TEST_CONFIG_FILENAME).is_err()); "#.to_string(), TEST_CONFIG_FILENAME).is_err());
} }

4
lib/src/rocket.rs
View File

@ -303,7 +303,7 @@ impl Rocket {
/// ///
/// # if false { // We don't actually want to launch the server in an example. /// # if false { // We don't actually want to launch the server in an example.
/// rocket::ignite().mount("/hello", vec![Route::new(Get, "/world", hi)]) /// rocket::ignite().mount("/hello", vec![Route::new(Get, "/world", hi)])
/// # :.launch() /// # .launch()
/// # } /// # }
/// ``` /// ```
pub fn mount(mut self, base: &str, routes: Vec<Route>) -> Self { pub fn mount(mut self, base: &str, routes: Vec<Route>) -> Self {
@ -351,7 +351,6 @@ impl Rocket {
/// rocket::ignite().launch() /// rocket::ignite().launch()
/// # } /// # }
/// ``` /// ```
#[cfg(not(feature = "testing"))]
pub fn launch(self) { pub fn launch(self) {
if self.router.has_collisions() { if self.router.has_collisions() {
warn!("Route collisions detected!"); warn!("Route collisions detected!");
@ -373,5 +372,4 @@ impl Rocket {
server.handle(self).unwrap(); server.handle(self).unwrap();
} }
} }