test: dispatch integration helpers through the production app

Use create_app inside the shared request helper so existing concise test calls exercise production routes and middleware. Update the prefix redirect assertion to check the actual 308 response and preserved request path.

Author: lovasoa

CONTRIBUTING.md

@@ -99,7 +99,8 @@ cargo test
 Use `common::response_for(path)` for ordinary integration requests and
 `common::response_with(path, config)` for custom configuration. Custom requests use
 `common::response_from(request)`; tests sharing database or cache state use `common::send_request`.
-These helpers dispatch through an Actix test service whose destructor drains its request pool.
+These helpers use the production `create_app` routes and middleware through an Actix test service,
+whose destructor drains its request pool.
 Keep `#[actix_web::test]`; standalone `TestRequest::to_srv_request()` retains application state.
 When testing Oracle locally, use `cargo test -- --test-threads=2` to avoid overwhelming the listener.
 

tests/common/mod.rs

@@ -14,7 +14,7 @@ use sqlpage::{
     AppState,
     app_config::{AppConfig, test_database_url},
     telemetry,
-    webserver::http::{form_config, main_handler, payload_config},
+    webserver::http::create_app,
 };
 use tokio::sync::oneshot;
 use tokio::task::JoinHandle;
@@ -71,27 +71,21 @@ pub(crate) async fn response_with_data(
     send_request(request_for(path), data).await
 }
 
-/// Runs a request through an Actix service so its request pool has an owner.
+/// Runs a request through the production app, including its routes and middleware.
 /// Dropping the service disables and drains the pool, including on error or panic.
 /// Standalone `TestRequest::to_srv_request()` would instead leak the application state.
 pub(crate) async fn send_request(
     request: TestRequest,
     data: Data<AppState>,
 ) -> actix_web::Result<ServiceResponse> {
-    let app = test::init_service(
-        App::new()
-            .app_data(payload_config(&data))
-            .app_data(form_config(&data))
-            .app_data(data)
-            .default_service(fn_service(main_handler)),
-    )
-    .await;
+    let app = test::init_service(create_app(data)).await;
     tokio::time::timeout(
         Duration::from_secs(8),
         test::try_call_service(&app, request.to_request()),
     )
     .await
     .map_err(actix_web::error::ErrorGatewayTimeout)?
+    .map(ServiceResponse::map_into_boxed_body)
 }
 
 /// Reads a whole response body as a UTF-8 string, failing the test otherwise.

tests/core/mod.rs

@@ -148,12 +148,10 @@ async fn test_routing_with_prefix() {
     let mut config = test_config();
     config.site_prefix = "/prefix/".to_string();
     let app_data = make_app_data_from_config(config).await.unwrap();
-    let resp = response_with_data(
-        "/prefix/tests/sql_test_files/component_rendering/simple.sql",
-        app_data.clone(),
-    )
-    .await
-    .unwrap();
+    let path = "/tests/sql_test_files/component_rendering/simple.sql";
+    let resp = response_with_data(format!("/prefix{path}"), app_data.clone())
+        .await
+        .unwrap();
     assert_eq!(resp.status(), StatusCode::OK);
     let body_str = crate::common::read_body_string(resp).await;
     assert!(
@@ -181,18 +179,13 @@ async fn test_routing_with_prefix() {
         .status_code();
     assert_eq!(resp, StatusCode::FORBIDDEN);
 
-    let resp = response_with_data(
-        "/tests/sql_test_files/component_rendering/simple.sql",
-        app_data,
-    )
-    .await
-    .unwrap();
-    assert_eq!(resp.status(), StatusCode::MOVED_PERMANENTLY);
+    let resp = response_with_data(path, app_data).await.unwrap();
+    assert_eq!(resp.status(), StatusCode::PERMANENT_REDIRECT);
     let location = resp
         .headers()
         .get("location")
         .expect("location header should be present");
-    assert_eq!(location.to_str().unwrap(), "/prefix/");
+    assert_eq!(location.to_str().unwrap(), format!("/prefix{path}"));
 }
 
 #[actix_web::test]