diff --git a/crates/bevy_mod_scripting_functions/Cargo.toml b/crates/bevy_mod_scripting_functions/Cargo.toml index 765efb3694..af24be2180 100644 --- a/crates/bevy_mod_scripting_functions/Cargo.toml +++ b/crates/bevy_mod_scripting_functions/Cargo.toml @@ -14,7 +14,6 @@ readme = "readme.md" [features] core_functions = [] bevy_bindings = [] -test_functions = ["test_utils", "regex"] [dependencies] @@ -34,5 +33,3 @@ bevy = { workspace = true, features = [ uuid = "1.11" smol_str = "0.2.2" bevy_mod_scripting_core = { workspace = true } -test_utils = { workspace = true, optional = true } -regex = { version = "1.11", optional = true } diff --git a/crates/bevy_mod_scripting_functions/src/lib.rs b/crates/bevy_mod_scripting_functions/src/lib.rs index db513ec87f..3293a82e77 100644 --- a/crates/bevy_mod_scripting_functions/src/lib.rs +++ b/crates/bevy_mod_scripting_functions/src/lib.rs @@ -2,10 +2,6 @@ use ::bevy::prelude::*; #[cfg(feature = "bevy_bindings")] pub mod bevy_bindings; pub mod core; - -#[cfg(feature = "test_functions")] -pub mod test_functions; - pub use core::*; pub struct ScriptFunctionsPlugin; @@ -14,8 +10,6 @@ impl Plugin for ScriptFunctionsPlugin { fn build(&self, app: &mut App) { register_bevy_bindings(app); register_core_functions(app); - #[cfg(feature = "test_functions")] - test_functions::register_test_functions(app); // TODO: if bevy ever does this itself we should remove this app.world_mut().register_component::(); diff --git a/crates/languages/bevy_mod_scripting_lua/Cargo.toml b/crates/languages/bevy_mod_scripting_lua/Cargo.toml index 38e47205e0..5959230be4 100644 --- a/crates/languages/bevy_mod_scripting_lua/Cargo.toml +++ b/crates/languages/bevy_mod_scripting_lua/Cargo.toml @@ -48,11 +48,6 @@ smallvec = "1.13" [dev-dependencies] script_integration_test_harness = { workspace = true } -bevy_mod_scripting_functions = { workspace = true, features = [ - "core_functions", - "bevy_bindings", - "test_functions", -] } libtest-mimic = "0.8" regex = "1.11" diff --git a/crates/languages/bevy_mod_scripting_rhai/Cargo.toml b/crates/languages/bevy_mod_scripting_rhai/Cargo.toml index 153894de3a..14dfdbb75b 100644 --- a/crates/languages/bevy_mod_scripting_rhai/Cargo.toml +++ b/crates/languages/bevy_mod_scripting_rhai/Cargo.toml @@ -24,11 +24,6 @@ bevy_mod_scripting_functions = { workspace = true, features = [ [dev-dependencies] script_integration_test_harness = { workspace = true } -bevy_mod_scripting_functions = { workspace = true, features = [ - "core_functions", - "bevy_bindings", - "test_functions", -] } libtest-mimic = "0.8" regex = "1.11" diff --git a/crates/script_integration_test_harness/Cargo.toml b/crates/script_integration_test_harness/Cargo.toml index 7c8f2f1c74..2f30451def 100644 --- a/crates/script_integration_test_harness/Cargo.toml +++ b/crates/script_integration_test_harness/Cargo.toml @@ -11,5 +11,5 @@ bevy_mod_scripting_core = { workspace = true } bevy_mod_scripting_functions = { workspace = true, features = [ "bevy_bindings", "core_functions", - "test_functions", ] } +regex = { version = "1.11" } diff --git a/crates/script_integration_test_harness/src/lib.rs b/crates/script_integration_test_harness/src/lib.rs index 5f43e75d6e..d0c7d0b0e0 100644 --- a/crates/script_integration_test_harness/src/lib.rs +++ b/crates/script_integration_test_harness/src/lib.rs @@ -1,3 +1,5 @@ +pub mod test_functions; + use bevy::{ app::App, prelude::{Entity, World}, @@ -14,6 +16,7 @@ use bevy_mod_scripting_core::{ IntoScriptPluginParams, }; use bevy_mod_scripting_functions::ScriptFunctionsPlugin; +use test_functions::register_test_functions; use test_utils::test_data::setup_integration_test; pub fn execute_integration_test< @@ -29,6 +32,8 @@ pub fn execute_integration_test< let mut app = setup_integration_test(init); app.add_plugins(ScriptFunctionsPlugin); + register_test_functions(&mut app); + init_app(&mut app); app.cleanup(); diff --git a/crates/bevy_mod_scripting_functions/src/test_functions.rs b/crates/script_integration_test_harness/src/test_functions.rs similarity index 100% rename from crates/bevy_mod_scripting_functions/src/test_functions.rs rename to crates/script_integration_test_harness/src/test_functions.rs