Skip to content

Commit de92a57

Browse files
committed
improved single header equality assertions
1 parent 08380d2 commit de92a57

File tree

2 files changed

+9
-33
lines changed

2 files changed

+9
-33
lines changed

src/request.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ impl<State> Request<State> {
124124
///
125125
/// let mut app = tide::new();
126126
/// app.at("/").get(|req: Request<()>| async move {
127-
/// assert_eq!(req.header("X-Forwarded-For").unwrap().last().as_str(), "127.0.0.1");
127+
/// assert_eq!(req.header("X-Forwarded-For").unwrap(), "127.0.0.1");
128128
/// Ok("")
129129
/// });
130130
/// app.listen("127.0.0.1:8080").await?;

src/security/cors.rs

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -282,27 +282,12 @@ mod test {
282282

283283
assert_eq!(res.status(), 200);
284284

285-
assert_eq!(
286-
res[headers::ACCESS_CONTROL_ALLOW_ORIGIN][0].as_str(),
287-
ALLOW_ORIGIN
288-
);
289-
assert_eq!(
290-
res[headers::ACCESS_CONTROL_ALLOW_METHODS][0].as_str(),
291-
ALLOW_METHODS
292-
);
293-
assert_eq!(
294-
res[headers::ACCESS_CONTROL_ALLOW_HEADERS][0].as_str(),
295-
WILDCARD
296-
);
297-
assert_eq!(
298-
res[headers::ACCESS_CONTROL_MAX_AGE][0].as_str(),
299-
DEFAULT_MAX_AGE
300-
);
285+
assert_eq!(res[headers::ACCESS_CONTROL_ALLOW_ORIGIN], ALLOW_ORIGIN);
286+
assert_eq!(res[headers::ACCESS_CONTROL_ALLOW_METHODS], ALLOW_METHODS);
287+
assert_eq!(res[headers::ACCESS_CONTROL_ALLOW_HEADERS], WILDCARD);
288+
assert_eq!(res[headers::ACCESS_CONTROL_MAX_AGE], DEFAULT_MAX_AGE);
301289

302-
assert_eq!(
303-
res[headers::ACCESS_CONTROL_ALLOW_CREDENTIALS][0].as_str(),
304-
"true"
305-
);
290+
assert_eq!(res[headers::ACCESS_CONTROL_ALLOW_CREDENTIALS], "true");
306291
}
307292
#[async_std::test]
308293
async fn default_cors_middleware() {
@@ -311,8 +296,7 @@ mod test {
311296
let res: crate::http::Response = app.respond(request()).await.unwrap();
312297

313298
assert_eq!(res.status(), 200);
314-
315-
assert_eq!(res[headers::ACCESS_CONTROL_ALLOW_ORIGIN][0].as_str(), "*");
299+
assert_eq!(res[headers::ACCESS_CONTROL_ALLOW_ORIGIN], "*");
316300
}
317301

318302
#[async_std::test]
@@ -328,10 +312,7 @@ mod test {
328312
let res: crate::http::Response = app.respond(request()).await.unwrap();
329313

330314
assert_eq!(res.status(), 200);
331-
assert_eq!(
332-
res[headers::ACCESS_CONTROL_ALLOW_ORIGIN][0].as_str(),
333-
ALLOW_ORIGIN
334-
);
315+
assert_eq!(res[headers::ACCESS_CONTROL_ALLOW_ORIGIN], ALLOW_ORIGIN);
335316
}
336317

337318
#[async_std::test]
@@ -341,12 +322,7 @@ mod test {
341322
let res: crate::http::Response = app.respond(request()).await.unwrap();
342323

343324
assert_eq!(res.status(), 200);
344-
assert_eq!(
345-
res[headers::ACCESS_CONTROL_ALLOW_CREDENTIALS]
346-
.last()
347-
.as_str(),
348-
"true"
349-
);
325+
assert_eq!(res[headers::ACCESS_CONTROL_ALLOW_CREDENTIALS], "true");
350326
}
351327

352328
#[async_std::test]

0 commit comments

Comments
 (0)