mirror of
https://github.com/rwf2/Rocket.git
synced 2024-12-31 23:02:37 +00:00
4e06ee64aa
Prior to this commit, it was not possible to test Rocket crates in production mode without setting a global secret key or bypassing secret key checking - the testing script did the latter. The consequence is that it became impossible to test secret key related failures because the tests passed regardless. This commit undoes this. As a consequence, all tests are now aware of the difference between debug and release configurations, the latter of which validates 'secret_key' by default. New 'Client::debug()' and 'Client::debug_with()' simplify creating an instance of 'Client' with configuration in debug mode to avoid undesired test failures. The summary of changes in this commit are: * Config 'secret_key' success and failure are now tested. * 'secret_key' validation was moved to pre-launch from 'Config:from()'. * 'Config::from()' only extracts the config. * Added 'Config::try_from()' for non-panicking extraction. * 'Config' now knows the profile it was extracted from. * The 'Config' provider sets a profile of 'Config.profile'. * 'Rocket', 'Client', 'Fairings', implement 'Debug'. * 'fairing::Info' implements 'Copy', 'Clone'. * 'Fairings' keeps track of, logs attach fairings. * 'Rocket::reconfigure()' was added to allow modifying a config. Internally, the testing script was refactored to properly test the codebase with the new changes. In particular, it no longer sets a rustc 'cfg' to avoid secret-key checking. Resolves #1543. Fixes #1564.
59 lines
1.6 KiB
Rust
59 lines
1.6 KiB
Rust
#[macro_use] extern crate rocket;
|
|
use rocket::Route;
|
|
|
|
pub fn prepend(prefix: &str, route: Route) -> Route {
|
|
route.map_base(|base| format!("{}{}", prefix, base)).unwrap()
|
|
}
|
|
|
|
pub fn extend_routes(prefix: &str, routes: Vec<Route>) -> Vec<Route> {
|
|
routes.into_iter()
|
|
.map(|route| prepend(prefix, route))
|
|
.collect()
|
|
}
|
|
|
|
mod a {
|
|
#[get("/b/<id>")]
|
|
fn b(id: u8) -> String { id.to_string() }
|
|
|
|
pub fn routes() -> Vec<rocket::Route> {
|
|
super::extend_routes("/a", routes![b])
|
|
}
|
|
}
|
|
|
|
fn rocket() -> rocket::Rocket {
|
|
rocket::ignite().mount("/", a::routes()).mount("/foo", a::routes())
|
|
}
|
|
|
|
mod mapped_base_tests {
|
|
use rocket::local::blocking::Client;
|
|
use rocket::http::Status;
|
|
|
|
#[test]
|
|
fn only_prefix() {
|
|
let client = Client::debug(super::rocket()).unwrap();
|
|
|
|
let response = client.get("/a/b/3").dispatch();
|
|
assert_eq!(response.into_string().unwrap(), "3");
|
|
|
|
let response = client.get("/a/b/239").dispatch();
|
|
assert_eq!(response.into_string().unwrap(), "239");
|
|
|
|
let response = client.get("/b/239").dispatch();
|
|
assert_eq!(response.status(), Status::NotFound);
|
|
}
|
|
|
|
#[test]
|
|
fn prefix_and_base() {
|
|
let client = Client::debug(super::rocket()).unwrap();
|
|
|
|
let response = client.get("/foo/a/b/23").dispatch();
|
|
assert_eq!(response.into_string().unwrap(), "23");
|
|
|
|
let response = client.get("/foo/a/b/99").dispatch();
|
|
assert_eq!(response.into_string().unwrap(), "99");
|
|
|
|
let response = client.get("/foo/b/239").dispatch();
|
|
assert_eq!(response.status(), Status::NotFound);
|
|
}
|
|
}
|