diff --git a/Cargo.lock b/Cargo.lock index e14fbbd3..c1fa2f94 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1853,15 +1853,14 @@ dependencies = [ "log", "pretty_assertions", "radicle", + "radicle-cli-test", "radicle-cob", "radicle-crypto", "radicle-node", "serde", "serde_json", "serde_yaml", - "shlex", "similar", - "snapbox", "tempfile", "thiserror", "timeago", @@ -1869,6 +1868,17 @@ dependencies = [ "zeroize", ] +[[package]] +name = "radicle-cli-test" +version = "0.1.0" +dependencies = [ + "log", + "pretty_assertions", + "shlex", + "snapbox", + "thiserror", +] + [[package]] name = "radicle-cob" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index a855c3b8..242765d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,7 @@ members = [ "radicle", "radicle-cob", "radicle-cli", + "radicle-cli-test", "radicle-crdt", "radicle-crypto", "radicle-dag", diff --git a/radicle-cli-test/Cargo.toml b/radicle-cli-test/Cargo.toml new file mode 100644 index 00000000..c8410d22 --- /dev/null +++ b/radicle-cli-test/Cargo.toml @@ -0,0 +1,13 @@ +[package] +name = "radicle-cli-test" +license = "MIT OR Apache-2.0" +version = "0.1.0" +authors = ["Alexis Sellier "] +edition = "2021" + +[dependencies] +log = { version = "0.4", features = ["std"] } +pretty_assertions = { version = "1.3.0" } +shlex = { version = "1.1.0" } +snapbox = { version = "0.4.3" } +thiserror = { version = "1" } diff --git a/radicle-cli/tests/framework/mod.rs b/radicle-cli-test/src/lib.rs similarity index 99% rename from radicle-cli/tests/framework/mod.rs rename to radicle-cli-test/src/lib.rs index cd5fa4e3..b71bf1ee 100644 --- a/radicle-cli/tests/framework/mod.rs +++ b/radicle-cli-test/src/lib.rs @@ -311,7 +311,7 @@ Running a simple command such as `head`: ``` $ head -n 2 Cargo.toml [package] -name = "radicle-cli" +name = "radicle-cli-test" ``` "# .trim() diff --git a/radicle-cli/Cargo.toml b/radicle-cli/Cargo.toml index eab73d67..4833d0d1 100644 --- a/radicle-cli/Cargo.toml +++ b/radicle-cli/Cargo.toml @@ -32,6 +32,10 @@ zeroize = { version = "1.1" } version = "0" path = "../radicle" +[dependencies.radicle-cli-test] +version = "0" +path = "../radicle-cli-test" + [dependencies.radicle-cob] version = "0" path = "../radicle-cob" @@ -45,5 +49,3 @@ pretty_assertions = { version = "1.3.0" } tempfile = { version = "3.3.0" } radicle = { path = "../radicle", features = ["test"] } radicle-node = { path = "../radicle-node", features = ["test"] } -shlex = { version = "1.1.0" } -snapbox = { version = "0.4.3" } diff --git a/radicle-cli/tests/commands.rs b/radicle-cli/tests/commands.rs index c1629884..f3680c0c 100644 --- a/radicle-cli/tests/commands.rs +++ b/radicle-cli/tests/commands.rs @@ -9,15 +9,13 @@ use radicle::profile::Home; use radicle::storage::{ReadRepository, WriteStorage}; use radicle::test::fixtures; +use radicle_cli_test::TestFormula; use radicle_node::service::tracking::Policy; use radicle_node::test::{ environment::{Config, Environment}, logger, }; -mod framework; -use framework::TestFormula; - /// Run a CLI test file. fn test<'a>( test: impl AsRef,