diff --git a/Cargo.lock b/Cargo.lock index 7924f76e9..b2b905807 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1524,9 +1524,17 @@ dependencies = [ name = "integration-tests" version = "0.4.1" dependencies = [ + "actix-rt", + "actix-web", + "anyhow", "cc", + "env_logger 0.8.4", + "log", + "pretty_assertions", "taskchampion", "taskchampion-lib", + "taskchampion-sync-server", + "tempfile", ] [[package]] @@ -2488,21 +2496,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "replica-server-tests" -version = "0.4.1" -dependencies = [ - "actix-rt", - "actix-web", - "anyhow", - "env_logger 0.8.4", - "log", - "pretty_assertions", - "taskchampion", - "taskchampion-sync-server", - "tempfile", -] - [[package]] name = "resolv-conf" version = "0.7.0" diff --git a/Cargo.toml b/Cargo.toml index 09c0a9677..18399678b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,6 @@ members = [ "taskchampion", "cli", "sync-server", - "replica-server-tests", "lib", "integration-tests", ] diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml index f351e17d3..71f39b6e6 100644 --- a/integration-tests/Cargo.toml +++ b/integration-tests/Cargo.toml @@ -8,6 +8,16 @@ build = "build.rs" [dependencies] taskchampion = { path = "../taskchampion" } +taskchampion-sync-server = { path = "../sync-server" } + +[dev-dependencies] +anyhow = "1.0" +actix-web = "^3.3.2" +actix-rt = "^1.1.1" +tempfile = "3" +pretty_assertions = "1" +log = "^0.4.14" +env_logger = "^0.8.3" [build-dependencies] cc = "1.0" diff --git a/replica-server-tests/tests/cross-sync.rs b/integration-tests/tests/cross-sync.rs similarity index 100% rename from replica-server-tests/tests/cross-sync.rs rename to integration-tests/tests/cross-sync.rs diff --git a/replica-server-tests/tests/snapshots.rs b/integration-tests/tests/snapshots.rs similarity index 100% rename from replica-server-tests/tests/snapshots.rs rename to integration-tests/tests/snapshots.rs diff --git a/replica-server-tests/Cargo.toml b/replica-server-tests/Cargo.toml deleted file mode 100644 index efe369b3c..000000000 --- a/replica-server-tests/Cargo.toml +++ /dev/null @@ -1,21 +0,0 @@ -[package] -name = "replica-server-tests" -version = "0.4.1" -authors = ["Dustin J. Mitchell "] -edition = "2018" -publish = false - -[dependencies.taskchampion-sync-server] -path = "../sync-server" - -[dependencies.taskchampion] -path = "../taskchampion" - -[dev-dependencies] -anyhow = "1.0" -actix-web = "^3.3.2" -actix-rt = "^1.1.1" -tempfile = "3" -pretty_assertions = "1" -log = "^0.4.14" -env_logger = "^0.8.3" diff --git a/replica-server-tests/src/lib.rs b/replica-server-tests/src/lib.rs deleted file mode 100644 index e783558fc..000000000 --- a/replica-server-tests/src/lib.rs +++ /dev/null @@ -1 +0,0 @@ -// test-only crate