Skip to content

Commit b23d97a

Browse files
committed
fix unstable tests
1 parent a896d96 commit b23d97a

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

tests/nested.rs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ use std::str::FromStr;
77
#[async_std::test]
88
async fn nested() {
99
let mut inner = tide::new();
10-
inner.at("/foo").get(|_| async { "foo" });
11-
inner.at("/bar").get(|_| async { "bar" });
10+
inner.at("/foo").get(|_| async { Ok("foo") });
11+
inner.at("/bar").get(|_| async { Ok("bar") });
1212

1313
let mut outer = tide::new();
1414
// Nest the inner app on /foo
@@ -35,17 +35,18 @@ async fn nested() {
3535

3636
#[async_std::test]
3737
async fn nested_middleware() {
38-
let echo_path = |req: tide::Request<()>| async move { req.uri().path().to_string() };
38+
let echo_path = |req: tide::Request<()>| async move { Ok(req.uri().path().to_string()) };
3939
fn test_middleware(
4040
req: tide::Request<()>,
4141
next: tide::Next<'_, ()>,
42-
) -> BoxFuture<'_, tide::Response> {
42+
) -> BoxFuture<'_, tide::Result<tide::Response>> {
4343
Box::pin(async move {
44-
let res = next.run(req).await;
45-
res.set_header(
44+
let res = next.run(req).await?;
45+
let res = res.set_header(
4646
HeaderName::from_ascii("X-Tide-Test".to_owned().into_bytes()).unwrap(),
4747
"1",
48-
)
48+
);
49+
Ok(res)
4950
})
5051
}
5152

@@ -92,9 +93,9 @@ async fn nested_with_different_state() {
9293
let mut inner = tide::with_state(42);
9394
inner.at("/").get(|req: tide::Request<i32>| async move {
9495
let num = req.state();
95-
format!("the number is {}", num)
96+
Ok(format!("the number is {}", num))
9697
});
97-
outer.at("/").get(|_| async move { "Hello, world!" });
98+
outer.at("/").get(|_| async move { Ok("Hello, world!") });
9899
outer.at("/foo").nest(inner);
99100

100101
let mut server = make_server(outer.into_http_service()).unwrap();

0 commit comments

Comments
 (0)