mirror of
https://github.com/rwf2/Rocket.git
synced 2024-12-28 13:22:38 +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.
68 lines
1.5 KiB
Rust
68 lines
1.5 KiB
Rust
#[macro_use] extern crate rocket;
|
|
|
|
use rocket::local::blocking::Client;
|
|
|
|
#[get("/easy/<id>")]
|
|
fn easy(id: i32) -> String {
|
|
format!("easy id: {}", id)
|
|
}
|
|
|
|
macro_rules! make_handler {
|
|
() => {
|
|
#[get("/hard/<id>")]
|
|
fn hard(id: i32) -> String {
|
|
format!("hard id: {}", id)
|
|
}
|
|
}
|
|
}
|
|
|
|
make_handler!();
|
|
|
|
|
|
macro_rules! foo {
|
|
($addr:expr, $name:ident) => {
|
|
#[get($addr)]
|
|
fn hi($name: String) -> String {
|
|
$name
|
|
}
|
|
};
|
|
}
|
|
|
|
// regression test for `#[get] panicking if used inside a macro
|
|
foo!("/hello/<name>", name);
|
|
|
|
#[test]
|
|
fn test_reexpansion() {
|
|
let rocket = rocket::ignite().mount("/", routes![easy, hard, hi]);
|
|
let client = Client::debug(rocket).unwrap();
|
|
|
|
let response = client.get("/easy/327").dispatch();
|
|
assert_eq!(response.into_string().unwrap(), "easy id: 327");
|
|
|
|
let response = client.get("/hard/72").dispatch();
|
|
assert_eq!(response.into_string().unwrap(), "hard id: 72");
|
|
|
|
let response = client.get("/hello/fish").dispatch();
|
|
assert_eq!(response.into_string().unwrap(), "fish");
|
|
}
|
|
|
|
macro_rules! index {
|
|
($type:ty) => {
|
|
#[get("/")]
|
|
fn index(thing: rocket::State<$type>) -> String {
|
|
format!("Thing: {}", *thing)
|
|
}
|
|
}
|
|
}
|
|
|
|
index!(i32);
|
|
|
|
#[test]
|
|
fn test_index() {
|
|
let rocket = rocket::ignite().mount("/", routes![index]).manage(100i32);
|
|
let client = Client::debug(rocket).unwrap();
|
|
|
|
let response = client.get("/").dispatch();
|
|
assert_eq!(response.into_string().unwrap(), "Thing: 100");
|
|
}
|