mirror of
https://github.com/rwf2/Rocket.git
synced 2025-01-08 02:32:37 +00:00
b8ba7b855f
Sessions -------- This commit removes the `Session` type in favor of methods on the `Cookies` types that allow for adding, removing, and getting private (signed and encrypted) cookies. These methods provide a superset of the functionality of `Session` while also being a minimal addition to the existing API. They can be used to implement the previous `Session` type as well as other forms of session storage. The new methods are: * Cookie::add_private(&mut self, Cookie) * Cookie::remove_private(&mut self, Cookie) * Cookie::get_private(&self, &str) Resolves #20 Testing ------- This commit removes the `rocket::testing` module. It adds the `rocket::local` module which provides a `Client` type for local dispatching of requests against a `Rocket` instance. This `local` package subsumes the previous `testing` package. Rocket Examples --------------- The `forms`, `optional_result`, and `hello_alt_methods` examples have been removed. The following example have been renamed: * extended_validation -> form_validation * hello_ranks -> ranking * from_request -> request_guard * hello_tls -> tls Other Changes ------------- This commit also includes the following smaller changes: * Config::{development, staging, production} constructors have been added for easier creation of default `Config` structures. * The `Config` type is exported from the root. * `Request` implements `Clone` and `Debug`. * `Request::new` is no longer exported. * A `Response::body_bytes` method was added to easily retrieve a response's body as a `Vec<u8>`.
73 lines
2.0 KiB
Rust
73 lines
2.0 KiB
Rust
#![feature(plugin)]
|
|
#![plugin(rocket_codegen)]
|
|
|
|
extern crate rocket;
|
|
|
|
#[post("/", format = "application/json")]
|
|
fn specified() -> &'static str {
|
|
"specified"
|
|
}
|
|
|
|
#[post("/", rank = 2)]
|
|
fn unspecified() -> &'static str {
|
|
"unspecified"
|
|
}
|
|
|
|
#[post("/", format = "application/json")]
|
|
fn specified_json() -> &'static str {
|
|
"specified_json"
|
|
}
|
|
|
|
#[post("/", format = "text/html")]
|
|
fn specified_html() -> &'static str {
|
|
"specified_html"
|
|
}
|
|
|
|
mod tests {
|
|
use super::*;
|
|
|
|
use rocket::Rocket;
|
|
use rocket::local::Client;
|
|
use rocket::http::{Status, ContentType};
|
|
|
|
fn rocket() -> Rocket {
|
|
rocket::ignite()
|
|
.mount("/first", routes![specified, unspecified])
|
|
.mount("/second", routes![specified_json, specified_html])
|
|
}
|
|
|
|
macro_rules! check_dispatch {
|
|
($mount:expr, $ct:expr, $body:expr) => (
|
|
let client = Client::new(rocket()).unwrap();
|
|
let mut req = client.post($mount);
|
|
let ct: Option<ContentType> = $ct;
|
|
if let Some(ct) = ct {
|
|
req.add_header(ct);
|
|
}
|
|
|
|
let mut response = req.dispatch();
|
|
let body_str = response.body_string();
|
|
let body: Option<&'static str> = $body;
|
|
match body {
|
|
Some(string) => assert_eq!(body_str, Some(string.to_string())),
|
|
None => assert_eq!(response.status(), Status::NotFound)
|
|
}
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn exact_match_or_forward() {
|
|
check_dispatch!("/first", Some(ContentType::JSON), Some("specified"));
|
|
check_dispatch!("/first", None, Some("unspecified"));
|
|
check_dispatch!("/first", Some(ContentType::HTML), Some("unspecified"));
|
|
}
|
|
|
|
#[test]
|
|
fn exact_match_or_none() {
|
|
check_dispatch!("/second", Some(ContentType::JSON), Some("specified_json"));
|
|
check_dispatch!("/second", Some(ContentType::HTML), Some("specified_html"));
|
|
check_dispatch!("/second", Some(ContentType::CSV), None);
|
|
check_dispatch!("/second", None, None);
|
|
}
|
|
}
|