berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

fix server test

This commit is contained in:
Rob Ede 2021-01-17 04:45:01 +00:00
parent de8fc0db74
commit 0aa6af71ab
No known key found for this signature in database
GPG Key ID: C2A3B36E841A91E6
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/test_server.rs
View File

@ -802,11 +802,10 @@ async fn test_reading_deflate_encoding_large_random_rustls() {
#[actix_rt::test] #[actix_rt::test]
async fn test_server_cookies() { async fn test_server_cookies() {
use actix_web::http; use actix_web::{http, HttpMessage};
let srv = test::TestServer::with_factory(|| { let srv = test::start(|| {
App::new().resource("/", |r| { App::new().default_service(web::to(|| async {
r.f(|_| {
HttpResponse::Ok() HttpResponse::Ok()
.cookie( .cookie(
http::CookieBuilder::new("first", "first_value") http::CookieBuilder::new("first", "first_value")
@ -816,8 +815,7 @@ async fn test_server_cookies() {
.cookie(http::Cookie::new("second", "first_value")) .cookie(http::Cookie::new("second", "first_value"))
.cookie(http::Cookie::new("second", "second_value")) .cookie(http::Cookie::new("second", "second_value"))
.finish() .finish()
}) }))
})
}); });
let first_cookie = http::CookieBuilder::new("first", "first_value") let first_cookie = http::CookieBuilder::new("first", "first_value")
@ -825,11 +823,11 @@ async fn test_server_cookies() {
.finish(); .finish();
let second_cookie = http::Cookie::new("second", "second_value"); let second_cookie = http::Cookie::new("second", "second_value");
let request = srv.get("/").finish().unwrap(); let req = srv.get("/");
let response = srv.execute(request.send()).unwrap(); let res = req.send().await.unwrap();
assert!(response.status().is_success()); assert!(res.status().is_success());
let cookies = response.cookies().expect("To have cookies"); let cookies = res.cookies().expect("To have cookies");
assert_eq!(cookies.len(), 2); assert_eq!(cookies.len(), 2);
if cookies[0] == first_cookie { if cookies[0] == first_cookie {
assert_eq!(cookies[1], second_cookie); assert_eq!(cookies[1], second_cookie);
@ -841,10 +839,9 @@ async fn test_server_cookies() {
let first_cookie = first_cookie.to_string(); let first_cookie = first_cookie.to_string();
let second_cookie = second_cookie.to_string(); let second_cookie = second_cookie.to_string();
// Check that we have exactly two instances of raw cookie headers // Check that we have exactly two instances of raw cookie headers
let cookies = response let cookies = res
.headers() .headers()
.get_all(http::header::SET_COOKIE) .get_all(http::header::SET_COOKIE)
.iter()
.map(|header| header.to_str().expect("To str").to_string()) .map(|header| header.to_str().expect("To str").to_string())
.collect::<Vec<_>>(); .collect::<Vec<_>>();
assert_eq!(cookies.len(), 2); assert_eq!(cookies.len(), 2);