From 90add4ca2604b2ea60b51d4d1c27b61b1e7413d0 Mon Sep 17 00:00:00 2001 From: takashiidobe Date: Tue, 23 Jun 2020 13:32:40 -0400 Subject: [PATCH] add test for nested route --- src/request.rs | 5 +++-- src/service.rs | 8 +++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/request.rs b/src/request.rs index 78a1868f7..c36e87260 100644 --- a/src/request.rs +++ b/src/request.rs @@ -135,6 +135,7 @@ impl HttpRequest { #[inline] pub fn match_pattern(&self) -> Option { self.0.rmap.match_pattern(self.path()) + } /// Checks if a given path matches a route #[inline] @@ -645,14 +646,14 @@ mod tests { move |req: HttpRequest| { assert_eq!( req.match_name(), - Some("/user/{id}/profile".to_owned()) + Some(&ResourceDef::new("/profile")) ); HttpResponse::Ok().finish() }, ))) .default_service(web::to(move |req: HttpRequest| { - assert!(req.match_pattern().is_none()); + assert!(req.match_name().is_none()); HttpResponse::Ok().finish() })), ), diff --git a/src/service.rs b/src/service.rs index f7e201779..775667a3d 100644 --- a/src/service.rs +++ b/src/service.rs @@ -195,7 +195,13 @@ impl ServiceRequest { pub fn match_info(&self) -> &Path { self.0.match_info() } - + + /// Counterpart to [`HttpRequest::match_name`](../struct.HttpRequest.html#method.match_name). + #[inline] + pub fn match_name(&self) -> Option<&ResourceDef> { + self.0.match_name() + } + /// Counterpart to [`HttpRequest::match_pattern`](../struct.HttpRequest.html#method.match_pattern). #[inline] pub fn match_pattern(&self) -> Option {