Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

editoast: removes fixtures V1 #8697

Merged
merged 2 commits into from
Sep 3, 2024
Merged

editoast: removes fixtures V1 #8697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59f6399
editoast: remove unused fixtures
leovalais Sep 2, 2024
ec80273
editoast: remove last fixtures v1 occurences & delete module
leovalais Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
335 changes: 0 additions & 335 deletions editoast/src/fixtures.rs
View file
Open in desktop

This file was deleted.

15 changes: 12 additions & 3 deletions editoast/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ extern crate diesel;
mod client;
mod core;
mod error;
mod fixtures;
mod generated_data;
mod infra_cache;
mod map;
Expand Down Expand Up @@ -905,8 +904,6 @@ impl CliError {
mod tests {
use super::*;

use crate::fixtures::tests::get_fast_rolling_stock_schema;
use crate::fixtures::tests::get_trainschedule_json_array;
use crate::modelsv2::fixtures::create_electrical_profile_set;
use crate::modelsv2::RollingStockModel;

Expand All @@ -920,6 +917,18 @@ mod tests {
use std::ops::DerefMut;
use tempfile::NamedTempFile;

pub fn get_trainschedule_json_array() -> &'static str {
include_str!("./tests/train_schedules/simple_array.json")
}

fn get_fast_rolling_stock_schema(name: &str) -> RollingStock {
let mut rolling_stock_form: RollingStock =
serde_json::from_str(include_str!("./tests/example_rolling_stock_1.json"))
.expect("Unable to parse");
rolling_stock_form.name = name.to_string();
rolling_stock_form
}

#[rstest]
async fn import_export_timetable_schedule_v2() {
let db_pool = DbConnectionPoolV2::for_tests();
Expand Down
Loading
Loading