mirror of
https://github.com/fafhrd91/actix-web
synced 2025-07-01 00:44:26 +02:00
Check format and tweak CI config (#1619)
This commit is contained in:
Yuki Okushi
GitHub
109
src/scope.rs
109
src/scope.rs
@ -678,12 +678,9 @@ mod tests {
|
||||
|
||||
#[actix_rt::test]
|
||||
async fn test_scope() {
|
||||
let mut srv = init_service(
|
||||
App::new().service(
|
||||
web::scope("/app")
|
||||
.service(web::resource("/path1").to(|| HttpResponse::Ok())),
|
||||
),
|
||||
)
|
||||
let mut srv = init_service(App::new().service(
|
||||
web::scope("/app").service(web::resource("/path1").to(HttpResponse::Ok)),
|
||||
))
|
||||
.await;
|
||||
|
||||
let req = TestRequest::with_uri("/app/path1").to_request();
|
||||
@ -696,8 +693,8 @@ mod tests {
|
||||
let mut srv = init_service(
|
||||
App::new().service(
|
||||
web::scope("/app")
|
||||
.service(web::resource("").to(|| HttpResponse::Ok()))
|
||||
.service(web::resource("/").to(|| HttpResponse::Created())),
|
||||
.service(web::resource("").to(HttpResponse::Ok))
|
||||
.service(web::resource("/").to(HttpResponse::Created)),
|
||||
),
|
||||
)
|
||||
.await;
|
||||
@ -714,7 +711,7 @@ mod tests {
|
||||
#[actix_rt::test]
|
||||
async fn test_scope_root2() {
|
||||
let mut srv = init_service(App::new().service(
|
||||
web::scope("/app/").service(web::resource("").to(|| HttpResponse::Ok())),
|
||||
web::scope("/app/").service(web::resource("").to(HttpResponse::Ok)),
|
||||
))
|
||||
.await;
|
||||
|
||||
@ -730,7 +727,7 @@ mod tests {
|
||||
#[actix_rt::test]
|
||||
async fn test_scope_root3() {
|
||||
let mut srv = init_service(App::new().service(
|
||||
web::scope("/app/").service(web::resource("/").to(|| HttpResponse::Ok())),
|
||||
web::scope("/app/").service(web::resource("/").to(HttpResponse::Ok)),
|
||||
))
|
||||
.await;
|
||||
|
||||
@ -748,8 +745,8 @@ mod tests {
|
||||
let mut srv = init_service(
|
||||
App::new().service(
|
||||
web::scope("app")
|
||||
.route("/path1", web::get().to(|| HttpResponse::Ok()))
|
||||
.route("/path1", web::delete().to(|| HttpResponse::Ok())),
|
||||
.route("/path1", web::get().to(HttpResponse::Ok))
|
||||
.route("/path1", web::delete().to(HttpResponse::Ok)),
|
||||
),
|
||||
)
|
||||
.await;
|
||||
@ -777,8 +774,8 @@ mod tests {
|
||||
App::new().service(
|
||||
web::scope("app").service(
|
||||
web::resource("path1")
|
||||
.route(web::get().to(|| HttpResponse::Ok()))
|
||||
.route(web::delete().to(|| HttpResponse::Ok())),
|
||||
.route(web::get().to(HttpResponse::Ok))
|
||||
.route(web::delete().to(HttpResponse::Ok)),
|
||||
),
|
||||
),
|
||||
)
|
||||
@ -807,7 +804,7 @@ mod tests {
|
||||
App::new().service(
|
||||
web::scope("/app")
|
||||
.guard(guard::Get())
|
||||
.service(web::resource("/path1").to(|| HttpResponse::Ok())),
|
||||
.service(web::resource("/path1").to(HttpResponse::Ok)),
|
||||
),
|
||||
)
|
||||
.await;
|
||||
@ -842,7 +839,7 @@ mod tests {
|
||||
|
||||
match resp.response().body() {
|
||||
ResponseBody::Body(Body::Bytes(ref b)) => {
|
||||
let bytes: Bytes = b.clone().into();
|
||||
let bytes = b.clone();
|
||||
assert_eq!(bytes, Bytes::from_static(b"project: project1"));
|
||||
}
|
||||
_ => panic!(),
|
||||
@ -855,14 +852,9 @@ mod tests {
|
||||
|
||||
#[actix_rt::test]
|
||||
async fn test_nested_scope() {
|
||||
let mut srv = init_service(
|
||||
App::new().service(
|
||||
web::scope("/app")
|
||||
.service(web::scope("/t1").service(
|
||||
web::resource("/path1").to(|| HttpResponse::Created()),
|
||||
)),
|
||||
),
|
||||
)
|
||||
let mut srv = init_service(App::new().service(web::scope("/app").service(
|
||||
web::scope("/t1").service(web::resource("/path1").to(HttpResponse::Created)),
|
||||
)))
|
||||
.await;
|
||||
|
||||
let req = TestRequest::with_uri("/app/t1/path1").to_request();
|
||||
@ -872,14 +864,9 @@ mod tests {
|
||||
|
||||
#[actix_rt::test]
|
||||
async fn test_nested_scope_no_slash() {
|
||||
let mut srv = init_service(
|
||||
App::new().service(
|
||||
web::scope("/app")
|
||||
.service(web::scope("t1").service(
|
||||
web::resource("/path1").to(|| HttpResponse::Created()),
|
||||
)),
|
||||
),
|
||||
)
|
||||
let mut srv = init_service(App::new().service(web::scope("/app").service(
|
||||
web::scope("t1").service(web::resource("/path1").to(HttpResponse::Created)),
|
||||
)))
|
||||
.await;
|
||||
|
||||
let req = TestRequest::with_uri("/app/t1/path1").to_request();
|
||||
@ -893,8 +880,8 @@ mod tests {
|
||||
App::new().service(
|
||||
web::scope("/app").service(
|
||||
web::scope("/t1")
|
||||
.service(web::resource("").to(|| HttpResponse::Ok()))
|
||||
.service(web::resource("/").to(|| HttpResponse::Created())),
|
||||
.service(web::resource("").to(HttpResponse::Ok))
|
||||
.service(web::resource("/").to(HttpResponse::Created)),
|
||||
),
|
||||
),
|
||||
)
|
||||
@ -916,7 +903,7 @@ mod tests {
|
||||
web::scope("/app").service(
|
||||
web::scope("/t1")
|
||||
.guard(guard::Get())
|
||||
.service(web::resource("/path1").to(|| HttpResponse::Ok())),
|
||||
.service(web::resource("/path1").to(HttpResponse::Ok)),
|
||||
),
|
||||
),
|
||||
)
|
||||
@ -953,7 +940,7 @@ mod tests {
|
||||
|
||||
match resp.response().body() {
|
||||
ResponseBody::Body(Body::Bytes(ref b)) => {
|
||||
let bytes: Bytes = b.clone().into();
|
||||
let bytes = b.clone();
|
||||
assert_eq!(bytes, Bytes::from_static(b"project: project_1"));
|
||||
}
|
||||
_ => panic!(),
|
||||
@ -981,7 +968,7 @@ mod tests {
|
||||
|
||||
match resp.response().body() {
|
||||
ResponseBody::Body(Body::Bytes(ref b)) => {
|
||||
let bytes: Bytes = b.clone().into();
|
||||
let bytes = b.clone();
|
||||
assert_eq!(bytes, Bytes::from_static(b"project: test - 1"));
|
||||
}
|
||||
_ => panic!(),
|
||||
@ -997,7 +984,7 @@ mod tests {
|
||||
let mut srv = init_service(
|
||||
App::new().service(
|
||||
web::scope("/app")
|
||||
.service(web::resource("/path1").to(|| HttpResponse::Ok()))
|
||||
.service(web::resource("/path1").to(HttpResponse::Ok))
|
||||
.default_service(|r: ServiceRequest| {
|
||||
ok(r.into_response(HttpResponse::BadRequest()))
|
||||
}),
|
||||
@ -1018,9 +1005,10 @@ mod tests {
|
||||
async fn test_default_resource_propagation() {
|
||||
let mut srv = init_service(
|
||||
App::new()
|
||||
.service(web::scope("/app1").default_service(
|
||||
web::resource("").to(|| HttpResponse::BadRequest()),
|
||||
))
|
||||
.service(
|
||||
web::scope("/app1")
|
||||
.default_service(web::resource("").to(HttpResponse::BadRequest)),
|
||||
)
|
||||
.service(web::scope("/app2"))
|
||||
.default_service(|r: ServiceRequest| {
|
||||
ok(r.into_response(HttpResponse::MethodNotAllowed()))
|
||||
@ -1043,21 +1031,21 @@ mod tests {
|
||||
|
||||
#[actix_rt::test]
|
||||
async fn test_middleware() {
|
||||
let mut srv =
|
||||
init_service(
|
||||
App::new().service(
|
||||
web::scope("app")
|
||||
.wrap(DefaultHeaders::new().header(
|
||||
let mut srv = init_service(
|
||||
App::new().service(
|
||||
web::scope("app")
|
||||
.wrap(
|
||||
DefaultHeaders::new().header(
|
||||
header::CONTENT_TYPE,
|
||||
HeaderValue::from_static("0001"),
|
||||
))
|
||||
.service(
|
||||
web::resource("/test")
|
||||
.route(web::get().to(|| HttpResponse::Ok())),
|
||||
),
|
||||
),
|
||||
)
|
||||
.await;
|
||||
)
|
||||
.service(
|
||||
web::resource("/test").route(web::get().to(HttpResponse::Ok)),
|
||||
),
|
||||
),
|
||||
)
|
||||
.await;
|
||||
|
||||
let req = TestRequest::with_uri("/app/test").to_request();
|
||||
let resp = call_service(&mut srv, req).await;
|
||||
@ -1084,7 +1072,7 @@ mod tests {
|
||||
Ok(res)
|
||||
}
|
||||
})
|
||||
.route("/test", web::get().to(|| HttpResponse::Ok())),
|
||||
.route("/test", web::get().to(HttpResponse::Ok)),
|
||||
),
|
||||
)
|
||||
.await;
|
||||
@ -1105,7 +1093,6 @@ mod tests {
|
||||
"/t",
|
||||
web::get().to(|data: web::Data<usize>| {
|
||||
assert_eq!(**data, 10);
|
||||
let _ = data.clone();
|
||||
HttpResponse::Ok()
|
||||
}),
|
||||
),
|
||||
@ -1141,7 +1128,6 @@ mod tests {
|
||||
"/t",
|
||||
web::get().to(|data: web::Data<usize>| {
|
||||
assert_eq!(**data, 10);
|
||||
let _ = data.clone();
|
||||
HttpResponse::Ok()
|
||||
}),
|
||||
),
|
||||
@ -1157,7 +1143,7 @@ mod tests {
|
||||
async fn test_scope_config() {
|
||||
let mut srv =
|
||||
init_service(App::new().service(web::scope("/app").configure(|s| {
|
||||
s.route("/path1", web::get().to(|| HttpResponse::Ok()));
|
||||
s.route("/path1", web::get().to(HttpResponse::Ok));
|
||||
})))
|
||||
.await;
|
||||
|
||||
@ -1171,7 +1157,7 @@ mod tests {
|
||||
let mut srv =
|
||||
init_service(App::new().service(web::scope("/app").configure(|s| {
|
||||
s.service(web::scope("/v1").configure(|s| {
|
||||
s.route("/", web::get().to(|| HttpResponse::Ok()));
|
||||
s.route("/", web::get().to(HttpResponse::Ok));
|
||||
}));
|
||||
})))
|
||||
.await;
|
||||
@ -1193,10 +1179,9 @@ mod tests {
|
||||
s.route(
|
||||
"/",
|
||||
web::get().to(|req: HttpRequest| async move {
|
||||
HttpResponse::Ok().body(format!(
|
||||
"{}",
|
||||
req.url_for("youtube", &["xxxxxx"]).unwrap().as_str()
|
||||
))
|
||||
HttpResponse::Ok().body(
|
||||
req.url_for("youtube", &["xxxxxx"]).unwrap().to_string(),
|
||||
)
|
||||
}),
|
||||
);
|
||||
}));
|
||||
|
||||
Reference in New Issue
Block a user