editoast: views: split a few tests in smaller ones

Signed-off-by: Loup Federico <16464925+Sh099078@users.noreply.github.com>

Author: Sh099078

editoast/src/views/infra/mod.rs

@@ -1011,30 +1011,39 @@ pub mod tests {
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
-    async fn infra_list_filters_authorized_infras() {
+    async fn infra_list_user_only_sees_its_related_infras() {
         let app = test_app!().build();
         let db_pool = app.db_pool();
-        let infra = create_small_infra(&mut db_pool.get_ok()).await;
-        let infra_no_grant = create_small_infra(&mut db_pool.get_ok()).await;
-
-        // Regular user with the correct roles should see only the infra he is associated with:
+        let infra_1 = create_small_infra(&mut db_pool.get_ok()).await;
+        let infra_2 = create_small_infra(&mut db_pool.get_ok()).await;
+        let _infra_no_grant = create_small_infra(&mut db_pool.get_ok()).await;
         let user = app
             .user("user_identity", "user_name")
-            .with_infra_grant(infra.id, InfraGrant::Reader)
+            .with_infra_grant(infra_1.id, InfraGrant::Reader)
+            .with_infra_grant(infra_2.id, InfraGrant::Reader)
             .create()
             .await;
         let response: InfraListResponse = app
             .get("/infra/")
             .by_user(user.as_ref())
             .await
-            .assert_status(StatusCode::OK)
+            .assert_status_ok()
             .json();
         assert_eq!(
-            response.results.iter().map(|infra| infra.id).collect_vec(),
-            vec![infra.id]
+            response
+                .results
+                .iter()
+                .map(|infra| infra.id)
+                .collect::<Vec<_>>(),
+            vec![infra_1.id, infra_2.id]
         );
+    }
 
-        // An admin should see all the infras:
+    #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+    async fn infra_list_admin_can_see_unrelated_infra() {
+        let app = test_app!().build();
+        let db_pool = app.db_pool();
+        let infra_no_grant = create_small_infra(&mut db_pool.get_ok()).await;
         let admin = app
             .user("admin", "admin")
             .with_roles([Role::Admin])
@@ -1044,11 +1053,15 @@ pub mod tests {
             .get("/infra/")
             .by_user(admin.as_ref())
             .await
-            .assert_status(StatusCode::OK)
+            .assert_status_ok()
             .json();
         assert_eq!(
-            response.results.iter().map(|infra| infra.id).collect_vec(),
-            vec![infra.id, infra_no_grant.id]
+            response
+                .results
+                .iter()
+                .map(|infra| infra.id)
+                .collect::<Vec<_>>(),
+            vec![infra_no_grant.id]
         );
     }
 

editoast/src/views/rolling_stock/light.rs

@@ -369,17 +369,16 @@ mod tests {
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
-    async fn rolling_stock_list_filters_authorized_rolling_stocks() {
+    async fn rolling_stock_list_user_only_sees_its_related_rolling_stocks() {
         let app = test_app!().build();
         let db_pool = app.db_pool();
-        let rolling_stock_grant =
-            create_fast_rolling_stock(&mut db_pool.get_ok(), "fast_rolling_stock_grant").await;
-        let rolling_stock_no_grant =
-            create_fast_rolling_stock(&mut db_pool.get_ok(), "fast_rolling_stock_no_grant").await;
-        // Regular user with the correct roles should see only the rolling stock he is associated with:
+        let rs_1 = create_fast_rolling_stock(&mut db_pool.get_ok(), "rs_1").await;
+        let rs_2 = create_fast_rolling_stock(&mut db_pool.get_ok(), "rs_2").await;
+        let _rs_no_grant = create_fast_rolling_stock(&mut db_pool.get_ok(), "rs_no_grant").await;
         let user = app
             .user("user_identity", "user_name")
-            .with_rolling_stock_grant(rolling_stock_grant.id, RollingStockGrant::Reader)
+            .with_rolling_stock_grant(rs_1.id, RollingStockGrant::Reader)
+            .with_rolling_stock_grant(rs_2.id, RollingStockGrant::Reader)
             .create()
             .await;
         let response: LightRollingStockWithLiveriesCountList = app
@@ -394,10 +393,15 @@ mod tests {
                 .iter()
                 .map(|rolling_stock| rolling_stock.rolling_stock.id)
                 .collect::<Vec<_>>(),
-            vec![rolling_stock_grant.id]
+            vec![rs_1.id, rs_2.id]
         );
-        // TODO: separate in two tests (admins_can_list_all_rolling_stocks and user_can_list_their_rolling_stocks)
-        // An admin should see all the rolling stocks:
+    }
+
+    #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
+    async fn rolling_stock_list_admin_can_see_unrelated_rolling_stock() {
+        let app = test_app!().build();
+        let db_pool = app.db_pool();
+        let rs_no_grant = create_fast_rolling_stock(&mut db_pool.get_ok(), "rs_no_grant").await;
         let admin = app
             .user("admin", "admin")
             .with_roles([Role::Admin])
@@ -415,7 +419,7 @@ mod tests {
                 .iter()
                 .map(|rolling_stock| rolling_stock.rolling_stock.id)
                 .collect::<Vec<_>>(),
-            vec![rolling_stock_grant.id, rolling_stock_no_grant.id]
+            vec![rs_no_grant.id]
         );
     }