Skip to content

Commit 3bf2d67

Browse files
committed
editoast: de-fixture train_with_simulation_output_fixture_set
1 parent d90f0d9 commit 3bf2d67

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

editoast/src/fixtures.rs

+7-9
Original file line numberDiff line numberDiff line change
@@ -383,9 +383,7 @@ pub mod tests {
383383

384384
#[fixture]
385385
pub async fn train_with_simulation_output_fixture_set(
386-
#[future] db_pool: Data<DbPool>,
387-
#[future] pathfinding: TestFixture<Pathfinding>,
388-
#[future] fast_rolling_stock: TestFixture<RollingStockModel>,
386+
db_pool: Data<DbPool>,
389387
) -> TrainScheduleWithSimulationOutputFixtureSet {
390388
let ScenarioFixtureSet {
391389
project,
@@ -394,10 +392,10 @@ pub mod tests {
394392
timetable,
395393
infra,
396394
} = scenario_fixture_set().await;
397-
let rolling_stock = fast_rolling_stock(db_pool()).await;
398-
let pathfinding = pathfinding(db_pool()).await;
395+
let rolling_stock = fast_rolling_stock(db_pool.clone()).await;
396+
let pathfinding = pathfinding(db_pool.clone()).await;
399397
let train_schedule = make_train_schedule(
400-
db_pool().clone(),
398+
db_pool.clone(),
401399
pathfinding.id(),
402400
timetable.id(),
403401
rolling_stock.id(),
@@ -436,13 +434,13 @@ pub mod tests {
436434
..Default::default()
437435
};
438436
let simulation_output: SimulationOutput = simulation_output
439-
.create(db_pool().clone())
437+
.create(db_pool.clone())
440438
.await
441439
.unwrap()
442440
.into();
443441

444-
let train_schedule = TestFixture::new(train_schedule, db_pool().clone());
445-
let simulation_output = TestFixture::new(simulation_output, db_pool());
442+
let train_schedule = TestFixture::new(train_schedule, db_pool.clone());
443+
let simulation_output = TestFixture::new(simulation_output, db_pool);
446444
TrainScheduleWithSimulationOutputFixtureSet {
447445
project,
448446
study,

0 commit comments

Comments
 (0)