diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ffe614ea..62179d8b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - rust_version: [stable, "1.40.0"] + rust_version: [stable, "1.43.1"] steps: - uses: actions/checkout@v1 diff --git a/Cargo.lock b/Cargo.lock index 73faed7a..21ddc3c4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1978,25 +1978,6 @@ dependencies = [ "serde_yaml", ] -[[package]] -name = "rojo-test" -version = "0.1.0" -dependencies = [ - "env_logger", - "insta", - "log", - "paste", - "rbx_dom_weak", - "reqwest", - "rojo", - "rojo-insta-ext", - "serde", - "serde_json", - "serde_yaml", - "tempfile", - "walkdir", -] - [[package]] name = "rust-argon2" version = "0.7.0" diff --git a/Cargo.toml b/Cargo.toml index 818dd973..772560fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,6 @@ dev_live_assets = [] [workspace] members = [ - "rojo-test", "rojo-insta-ext", "clibrojo", "memofs", @@ -39,7 +38,6 @@ members = [ default-members = [ ".", - "rojo-test", "rojo-insta-ext", "memofs", ] diff --git a/README.md b/README.md index 4ab247ec..edf89258 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Check out our [contribution guide](CONTRIBUTING.md) for detailed instructions fo Pull requests are welcome! -Rojo supports Rust 1.40.0 and newer. The minimum supported version of Rust is based on the latest versions of the dependencies that Rojo has. +Rojo supports Rust 1.43.1 and newer. The minimum supported version of Rust is based on the latest versions of the dependencies that Rojo has. ## License Rojo is available under the terms of the Mozilla Public License, Version 2.0. See [LICENSE.txt](LICENSE.txt) for details. \ No newline at end of file diff --git a/rojo-test/Cargo.toml b/rojo-test/Cargo.toml deleted file mode 100644 index 39d91393..00000000 --- a/rojo-test/Cargo.toml +++ /dev/null @@ -1,27 +0,0 @@ -[package] -name = "rojo-test" -version = "0.1.0" -authors = ["Lucien Greathouse "] -edition = "2018" -publish = false - -[features] -default = [] - -unstable_glob_ignore_paths = [] - -[dependencies] -env_logger = "0.7.1" -insta = { version = "0.13.1", features = ["redactions"] } -log = "0.4.8" -paste = "0.1.5" -rbx_dom_weak = "1.9.0" -reqwest = "0.9.20" -serde = "1.0.99" -serde_json = "1.0.40" -serde_yaml = "0.8.9" -tempfile = "3.1.0" -walkdir = "2.2.9" - -rojo = { path = ".." } -rojo-insta-ext = { path = "../rojo-insta-ext" } diff --git a/rojo-test/README.md b/rojo-test/README.md deleted file mode 100644 index 166044a1..00000000 --- a/rojo-test/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# rojo-test -This project does end-to-end testing of Rojo by executing it and checking what side-effects it has. - -rojo-test is meant to be run as a test with: - -```bash -cargo test -``` \ No newline at end of file diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__client_in_folder.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__client_in_folder.snap similarity index 91% rename from rojo-test/build-test-snapshots/rojo_test__build_test__client_in_folder.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__client_in_folder.snap index 27695545..3953fcb6 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__client_in_folder.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__client_in_folder.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__client_init.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__client_init.snap similarity index 88% rename from rojo-test/build-test-snapshots/rojo_test__build_test__client_init.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__client_init.snap index eacede5a..f3391ebe 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__client_init.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__client_init.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__csv_bug_145.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_bug_145.snap similarity index 92% rename from rojo-test/build-test-snapshots/rojo_test__build_test__csv_bug_145.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__csv_bug_145.snap index 48146d39..ab7470b3 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__csv_bug_145.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_bug_145.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__csv_bug_147.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_bug_147.snap similarity index 96% rename from rojo-test/build-test-snapshots/rojo_test__build_test__csv_bug_147.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__csv_bug_147.snap index defea874..d16de20f 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__csv_bug_147.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_bug_147.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__csv_in_folder.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_in_folder.snap similarity index 92% rename from rojo-test/build-test-snapshots/rojo_test__build_test__csv_in_folder.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__csv_in_folder.snap index 3917a988..d60fca02 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__csv_in_folder.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__csv_in_folder.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__deep_nesting.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__deep_nesting.snap similarity index 94% rename from rojo-test/build-test-snapshots/rojo_test__build_test__deep_nesting.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__deep_nesting.snap index 9e4dc471..18e0bab6 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__deep_nesting.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__deep_nesting.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__gitkeep.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__gitkeep.snap similarity index 83% rename from rojo-test/build-test-snapshots/rojo_test__build_test__gitkeep.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__gitkeep.snap index fe025fc9..003a210d 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__gitkeep.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__gitkeep.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__ignore_glob_inner.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__ignore_glob_inner.snap similarity index 96% rename from rojo-test/build-test-snapshots/rojo_test__build_test__ignore_glob_inner.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__ignore_glob_inner.snap index 9ff1bdec..338493fd 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__ignore_glob_inner.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__ignore_glob_inner.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__ignore_glob_nested.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__ignore_glob_nested.snap similarity index 91% rename from rojo-test/build-test-snapshots/rojo_test__build_test__ignore_glob_nested.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__ignore_glob_nested.snap index aab8afaf..7d6b063d 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__ignore_glob_nested.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__ignore_glob_nested.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__ignore_glob_spec.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__ignore_glob_spec.snap similarity index 92% rename from rojo-test/build-test-snapshots/rojo_test__build_test__ignore_glob_spec.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__ignore_glob_spec.snap index 7fc338f9..4d427f15 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__ignore_glob_spec.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__ignore_glob_spec.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__infer_service_name.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__infer_service_name.snap similarity index 95% rename from rojo-test/build-test-snapshots/rojo_test__build_test__infer_service_name.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__infer_service_name.snap index bda746ce..98b92a46 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__infer_service_name.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__infer_service_name.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__infer_starter_player.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__infer_starter_player.snap similarity index 95% rename from rojo-test/build-test-snapshots/rojo_test__build_test__infer_starter_player.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__infer_starter_player.snap index 13574f23..6e9e5fc0 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__infer_starter_player.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__infer_starter_player.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__init_meta_class_name.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__init_meta_class_name.snap similarity index 84% rename from rojo-test/build-test-snapshots/rojo_test__build_test__init_meta_class_name.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__init_meta_class_name.snap index 8a5f8a06..889fca12 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__init_meta_class_name.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__init_meta_class_name.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__init_meta_properties.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__init_meta_properties.snap similarity index 87% rename from rojo-test/build-test-snapshots/rojo_test__build_test__init_meta_properties.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__init_meta_properties.snap index 5d24b949..0613bbe8 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__init_meta_properties.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__init_meta_properties.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__init_with_children.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__init_with_children.snap similarity index 92% rename from rojo-test/build-test-snapshots/rojo_test__build_test__init_with_children.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__init_with_children.snap index 98f2f030..09346fe4 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__init_with_children.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__init_with_children.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__json_as_lua.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__json_as_lua.snap similarity index 91% rename from rojo-test/build-test-snapshots/rojo_test__build_test__json_as_lua.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__json_as_lua.snap index 8fcead0a..9ce0846c 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__json_as_lua.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__json_as_lua.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__json_model_in_folder.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__json_model_in_folder.snap similarity index 93% rename from rojo-test/build-test-snapshots/rojo_test__build_test__json_model_in_folder.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__json_model_in_folder.snap index 67013a05..cf1dba88 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__json_model_in_folder.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__json_model_in_folder.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__json_model_legacy_name.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__json_model_legacy_name.snap similarity index 90% rename from rojo-test/build-test-snapshots/rojo_test__build_test__json_model_legacy_name.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__json_model_legacy_name.snap index 0a0b7fba..ba8299cf 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__json_model_legacy_name.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__json_model_legacy_name.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__module_in_folder.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__module_in_folder.snap similarity index 91% rename from rojo-test/build-test-snapshots/rojo_test__build_test__module_in_folder.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__module_in_folder.snap index 6a73f1fd..91a79007 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__module_in_folder.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__module_in_folder.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__module_init.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__module_init.snap similarity index 87% rename from rojo-test/build-test-snapshots/rojo_test__build_test__module_init.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__module_init.snap index e6cd09e3..52737a9e 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__module_init.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__module_init.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__rbxm_in_folder.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__rbxm_in_folder.snap similarity index 89% rename from rojo-test/build-test-snapshots/rojo_test__build_test__rbxm_in_folder.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__rbxm_in_folder.snap index f67a3d9e..81296c91 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__rbxm_in_folder.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__rbxm_in_folder.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__rbxmx_in_folder.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__rbxmx_in_folder.snap similarity index 96% rename from rojo-test/build-test-snapshots/rojo_test__build_test__rbxmx_in_folder.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__rbxmx_in_folder.snap index 21a7a396..92cab199 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__rbxmx_in_folder.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__rbxmx_in_folder.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__rbxmx_ref.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__rbxmx_ref.snap similarity index 95% rename from rojo-test/build-test-snapshots/rojo_test__build_test__rbxmx_ref.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__rbxmx_ref.snap index 26ada371..1f1e21a2 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__rbxmx_ref.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__rbxmx_ref.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__script_meta_disabled.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__script_meta_disabled.snap similarity index 92% rename from rojo-test/build-test-snapshots/rojo_test__build_test__script_meta_disabled.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__script_meta_disabled.snap index 45f01e48..0876056e 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__script_meta_disabled.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__script_meta_disabled.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__server_in_folder.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__server_in_folder.snap similarity index 91% rename from rojo-test/build-test-snapshots/rojo_test__build_test__server_in_folder.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__server_in_folder.snap index 006917b2..282889d0 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__server_in_folder.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__server_in_folder.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__server_init.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__server_init.snap similarity index 87% rename from rojo-test/build-test-snapshots/rojo_test__build_test__server_init.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__server_init.snap index 9aa4fa5e..070b7012 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__server_init.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__server_init.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__txt.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__txt.snap similarity index 87% rename from rojo-test/build-test-snapshots/rojo_test__build_test__txt.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__txt.snap index 004b83c1..85159a12 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__txt.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__txt.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__txt_in_folder.snap b/rojo-test/build-test-snapshots/end_to_end__tests__build__txt_in_folder.snap similarity index 91% rename from rojo-test/build-test-snapshots/rojo_test__build_test__txt_in_folder.snap rename to rojo-test/build-test-snapshots/end_to_end__tests__build__txt_in_folder.snap index cc6ba42d..ca297d2a 100644 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__txt_in_folder.snap +++ b/rojo-test/build-test-snapshots/end_to_end__tests__build__txt_in_folder.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/build_test.rs +source: tests/tests/build.rs expression: contents --- diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__plain.txt.snap b/rojo-test/build-test-snapshots/rojo_test__build_test__plain.txt.snap deleted file mode 100644 index bd9ec616..00000000 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__plain.txt.snap +++ /dev/null @@ -1,12 +0,0 @@ ---- -source: rojo-test/src/build_test.rs -expression: contents ---- - - - - plain - This is a bare text file with no project. - - - diff --git a/rojo-test/build-test-snapshots/rojo_test__build_test__plain_gitkeep.snap b/rojo-test/build-test-snapshots/rojo_test__build_test__plain_gitkeep.snap deleted file mode 100644 index ccf37852..00000000 --- a/rojo-test/build-test-snapshots/rojo_test__build_test__plain_gitkeep.snap +++ /dev/null @@ -1,11 +0,0 @@ ---- -source: rojo-test/src/build_test.rs -expression: contents ---- - - - - plain_gitkeep - - - diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__add_folder_all-2.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_all-2.snap similarity index 92% rename from rojo-test/serve-test-snapshots/rojo_test__serve_test__add_folder_all-2.snap rename to rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_all-2.snap index 379aa949..29d3b553 100644 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__add_folder_all-2.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_all-2.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/serve_test.rs +source: tests/tests/serve.rs expression: "read_response.intern_and_redact(&mut redactions, root_id)" --- instances: diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__add_folder_all.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_all.snap similarity index 88% rename from rojo-test/serve-test-snapshots/rojo_test__serve_test__add_folder_all.snap rename to rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_all.snap index 53d11e9b..fc902c99 100644 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__add_folder_all.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_all.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/serve_test.rs +source: tests/tests/serve.rs expression: "read_response.intern_and_redact(&mut redactions, root_id)" --- instances: diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__just_txt_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_info.snap similarity index 81% rename from rojo-test/serve-test-snapshots/rojo_test__serve_test__just_txt_info.snap rename to rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_info.snap index ffc35c89..62f5dc4b 100644 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__just_txt_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_info.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/serve_test.rs +source: tests/tests/serve.rs expression: redactions.redacted_yaml(info) --- expectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__add_folder_subscribe.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_subscribe.snap similarity index 91% rename from rojo-test/serve-test-snapshots/rojo_test__serve_test__add_folder_subscribe.snap rename to rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_subscribe.snap index 49d489dc..09d4512c 100644 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__add_folder_subscribe.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__add_folder_subscribe.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/serve_test.rs +source: tests/tests/serve.rs expression: "subscribe_response.intern_and_redact(&mut redactions, ())" --- messageCursor: 1 diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__edit_init_all-2.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_all-2.snap similarity index 90% rename from rojo-test/serve-test-snapshots/rojo_test__serve_test__edit_init_all-2.snap rename to rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_all-2.snap index d11fbb4b..688f72d6 100644 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__edit_init_all-2.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_all-2.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/serve_test.rs +source: tests/tests/serve.rs expression: "read_response.intern_and_redact(&mut redactions, root_id)" --- instances: diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__edit_init_all.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_all.snap similarity index 90% rename from rojo-test/serve-test-snapshots/rojo_test__serve_test__edit_init_all.snap rename to rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_all.snap index 9596f3a8..a484d8e2 100644 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__edit_init_all.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_all.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/serve_test.rs +source: tests/tests/serve.rs expression: "read_response.intern_and_redact(&mut redactions, root_id)" --- instances: diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__add_folder_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_info.snap similarity index 81% rename from rojo-test/serve-test-snapshots/rojo_test__serve_test__add_folder_info.snap rename to rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_info.snap index ffc35c89..62f5dc4b 100644 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__add_folder_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_info.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/serve_test.rs +source: tests/tests/serve.rs expression: redactions.redacted_yaml(info) --- expectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__edit_init_subscribe.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_subscribe.snap similarity index 91% rename from rojo-test/serve-test-snapshots/rojo_test__serve_test__edit_init_subscribe.snap rename to rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_subscribe.snap index ef6a4fc8..bb3f9990 100644 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__edit_init_subscribe.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__edit_init_subscribe.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/serve_test.rs +source: tests/tests/serve.rs expression: "subscribe_response.intern_and_redact(&mut redactions, ())" --- messageCursor: 1 diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__empty_all.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_all.snap similarity index 88% rename from rojo-test/serve-test-snapshots/rojo_test__serve_test__empty_all.snap rename to rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_all.snap index 7aca5205..188f854f 100644 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__empty_all.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_all.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/serve_test.rs +source: tests/tests/serve.rs expression: "read_response.intern_and_redact(&mut redactions, root_id)" --- instances: diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__empty_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_info.snap similarity index 81% rename from rojo-test/serve-test-snapshots/rojo_test__serve_test__empty_info.snap rename to rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_info.snap index ffc35c89..62f5dc4b 100644 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__empty_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__empty_info.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/serve_test.rs +source: tests/tests/serve.rs expression: redactions.redacted_yaml(info) --- expectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__move_folder_of_stuff_all-2.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_all-2.snap similarity index 98% rename from rojo-test/serve-test-snapshots/rojo_test__serve_test__move_folder_of_stuff_all-2.snap rename to rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_all-2.snap index d73ce024..96e5126e 100644 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__move_folder_of_stuff_all-2.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_all-2.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/serve_test.rs +source: tests/tests/serve.rs expression: "read_response.intern_and_redact(&mut redactions, root_id)" --- instances: diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__move_folder_of_stuff_all.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_all.snap similarity index 89% rename from rojo-test/serve-test-snapshots/rojo_test__serve_test__move_folder_of_stuff_all.snap rename to rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_all.snap index 2f0cfd81..1f189d00 100644 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__move_folder_of_stuff_all.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_all.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/serve_test.rs +source: tests/tests/serve.rs expression: "read_response.intern_and_redact(&mut redactions, root_id)" --- instances: diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__edit_init_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_info.snap similarity index 81% rename from rojo-test/serve-test-snapshots/rojo_test__serve_test__edit_init_info.snap rename to rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_info.snap index ffc35c89..62f5dc4b 100644 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__edit_init_info.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_info.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/serve_test.rs +source: tests/tests/serve.rs expression: redactions.redacted_yaml(info) --- expectedPlaceIds: ~ diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__move_folder_of_stuff_subscribe.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_subscribe.snap similarity index 98% rename from rojo-test/serve-test-snapshots/rojo_test__serve_test__move_folder_of_stuff_subscribe.snap rename to rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_subscribe.snap index fa026ed2..9f544c5c 100644 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__move_folder_of_stuff_subscribe.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__move_folder_of_stuff_subscribe.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/serve_test.rs +source: tests/tests/serve.rs expression: "subscribe_response.intern_and_redact(&mut redactions, ())" --- messageCursor: 1 diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__remove_file_all-2.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_all-2.snap similarity index 88% rename from rojo-test/serve-test-snapshots/rojo_test__serve_test__remove_file_all-2.snap rename to rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_all-2.snap index ce9ed750..b3c0a7fd 100644 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__remove_file_all-2.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_all-2.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/serve_test.rs +source: tests/tests/serve.rs expression: "read_response.intern_and_redact(&mut redactions, root_id)" --- instances: diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__remove_file_all.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_all.snap similarity index 93% rename from rojo-test/serve-test-snapshots/rojo_test__serve_test__remove_file_all.snap rename to rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_all.snap index e133c4ea..8534c320 100644 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__remove_file_all.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_all.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/serve_test.rs +source: tests/tests/serve.rs expression: "read_response.intern_and_redact(&mut redactions, root_id)" --- instances: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_info.snap new file mode 100644 index 00000000..62f5dc4b --- /dev/null +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_info.snap @@ -0,0 +1,9 @@ +--- +source: tests/tests/serve.rs +expression: redactions.redacted_yaml(info) +--- +expectedPlaceIds: ~ +protocolVersion: 3 +rootInstanceId: id-2 +serverVersion: "[server-version]" +sessionId: id-1 diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__remove_file_subscribe.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_subscribe.snap similarity index 83% rename from rojo-test/serve-test-snapshots/rojo_test__serve_test__remove_file_subscribe.snap rename to rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_subscribe.snap index e4f34a28..e70d17f9 100644 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__remove_file_subscribe.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__remove_file_subscribe.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/serve_test.rs +source: tests/tests/serve.rs expression: "subscribe_response.intern_and_redact(&mut redactions, ())" --- messageCursor: 1 diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__scripts_all-2.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all-2.snap similarity index 95% rename from rojo-test/serve-test-snapshots/rojo_test__serve_test__scripts_all-2.snap rename to rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all-2.snap index edc0daef..7571797f 100644 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__scripts_all-2.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all-2.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/serve_test.rs +source: tests/tests/serve.rs expression: "read_response.intern_and_redact(&mut redactions, root_id)" --- instances: diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__scripts_all.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all.snap similarity index 95% rename from rojo-test/serve-test-snapshots/rojo_test__serve_test__scripts_all.snap rename to rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all.snap index 64542c22..6f67d05c 100644 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__scripts_all.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_all.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/serve_test.rs +source: tests/tests/serve.rs expression: "read_response.intern_and_redact(&mut redactions, root_id)" --- instances: diff --git a/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_info.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_info.snap new file mode 100644 index 00000000..62f5dc4b --- /dev/null +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_info.snap @@ -0,0 +1,9 @@ +--- +source: tests/tests/serve.rs +expression: redactions.redacted_yaml(info) +--- +expectedPlaceIds: ~ +protocolVersion: 3 +rootInstanceId: id-2 +serverVersion: "[server-version]" +sessionId: id-1 diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__scripts_subscribe.snap b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_subscribe.snap similarity index 90% rename from rojo-test/serve-test-snapshots/rojo_test__serve_test__scripts_subscribe.snap rename to rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_subscribe.snap index 7d52bc4d..4b373663 100644 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__scripts_subscribe.snap +++ b/rojo-test/serve-test-snapshots/end_to_end__tests__serve__scripts_subscribe.snap @@ -1,5 +1,5 @@ --- -source: rojo-test/src/serve_test.rs +source: tests/tests/serve.rs expression: "subscribe_response.intern_and_redact(&mut redactions, ())" --- messageCursor: 1 diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__just_txt_all.snap b/rojo-test/serve-test-snapshots/rojo_test__serve_test__just_txt_all.snap deleted file mode 100644 index e67add37..00000000 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__just_txt_all.snap +++ /dev/null @@ -1,19 +0,0 @@ ---- -source: rojo-test/src/serve_test.rs -expression: "read_response.intern_and_redact(&mut redactions, root_id)" ---- -instances: - id-2: - Children: [] - ClassName: StringValue - Id: id-2 - Metadata: - ignoreUnknownInstances: false - Name: just_txt - Parent: ~ - Properties: - Value: - Type: String - Value: "Hello, world!" -messageCursor: 0 -sessionId: id-1 diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__move_folder_of_stuff_info.snap b/rojo-test/serve-test-snapshots/rojo_test__serve_test__move_folder_of_stuff_info.snap deleted file mode 100644 index ffc35c89..00000000 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__move_folder_of_stuff_info.snap +++ /dev/null @@ -1,9 +0,0 @@ ---- -source: rojo-test/src/serve_test.rs -expression: redactions.redacted_yaml(info) ---- -expectedPlaceIds: ~ -protocolVersion: 3 -rootInstanceId: id-2 -serverVersion: "[server-version]" -sessionId: id-1 diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__remove_file_info.snap b/rojo-test/serve-test-snapshots/rojo_test__serve_test__remove_file_info.snap deleted file mode 100644 index ffc35c89..00000000 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__remove_file_info.snap +++ /dev/null @@ -1,9 +0,0 @@ ---- -source: rojo-test/src/serve_test.rs -expression: redactions.redacted_yaml(info) ---- -expectedPlaceIds: ~ -protocolVersion: 3 -rootInstanceId: id-2 -serverVersion: "[server-version]" -sessionId: id-1 diff --git a/rojo-test/serve-test-snapshots/rojo_test__serve_test__scripts_info.snap b/rojo-test/serve-test-snapshots/rojo_test__serve_test__scripts_info.snap deleted file mode 100644 index ffc35c89..00000000 --- a/rojo-test/serve-test-snapshots/rojo_test__serve_test__scripts_info.snap +++ /dev/null @@ -1,9 +0,0 @@ ---- -source: rojo-test/src/serve_test.rs -expression: redactions.redacted_yaml(info) ---- -expectedPlaceIds: ~ -protocolVersion: 3 -rootInstanceId: id-2 -serverVersion: "[server-version]" -sessionId: id-1 diff --git a/rojo-test/src/lib.rs b/rojo-test/src/lib.rs deleted file mode 100644 index cd4e7461..00000000 --- a/rojo-test/src/lib.rs +++ /dev/null @@ -1,7 +0,0 @@ -#![cfg(test)] - -mod build_test; -mod internable; -mod serve_test; -mod serve_util; -mod util; diff --git a/tests/end_to_end.rs b/tests/end_to_end.rs new file mode 100644 index 00000000..3e191799 --- /dev/null +++ b/tests/end_to_end.rs @@ -0,0 +1,2 @@ +mod rojo_test; +mod tests; diff --git a/rojo-test/src/internable.rs b/tests/rojo_test/internable.rs similarity index 100% rename from rojo-test/src/internable.rs rename to tests/rojo_test/internable.rs diff --git a/rojo-test/src/util.rs b/tests/rojo_test/io_util.rs similarity index 70% rename from rojo-test/src/util.rs rename to tests/rojo_test/io_util.rs index e0b59f87..b060be65 100644 --- a/rojo-test/src/util.rs +++ b/tests/rojo_test/io_util.rs @@ -6,16 +6,9 @@ use std::{ use walkdir::WalkDir; -pub fn get_rojo_path() -> PathBuf { - let working_dir = get_working_dir_path(); - - let mut exe_path = working_dir.join("target/debug/rojo"); - if cfg!(windows) { - exe_path.set_extension("exe"); - } - - exe_path -} +pub static ROJO_PATH: &str = env!("CARGO_BIN_EXE_rojo"); +pub static BUILD_TESTS_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/rojo-test/build-tests"); +pub static SERVE_TESTS_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/rojo-test/serve-tests"); pub fn get_working_dir_path() -> PathBuf { let mut manifest_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")); @@ -26,16 +19,6 @@ pub fn get_working_dir_path() -> PathBuf { manifest_dir } -pub fn get_build_tests_path() -> PathBuf { - let manifest_dir = Path::new(env!("CARGO_MANIFEST_DIR")); - manifest_dir.join("build-tests") -} - -pub fn get_serve_tests_path() -> PathBuf { - let manifest_dir = Path::new(env!("CARGO_MANIFEST_DIR")); - manifest_dir.join("serve-tests") -} - /// Recursively walk a directory and copy each item to the equivalent location /// in another directory. Equivalent to `cp -r src/* dst` pub fn copy_recursive(from: &Path, to: &Path) -> io::Result<()> { diff --git a/tests/rojo_test/mod.rs b/tests/rojo_test/mod.rs new file mode 100644 index 00000000..fd0cda3a --- /dev/null +++ b/tests/rojo_test/mod.rs @@ -0,0 +1,3 @@ +pub mod internable; +pub mod io_util; +pub mod serve_util; diff --git a/rojo-test/src/serve_util.rs b/tests/rojo_test/serve_util.rs similarity index 93% rename from rojo-test/src/serve_util.rs rename to tests/rojo_test/serve_util.rs index 918f5c32..d38eb2c7 100644 --- a/rojo-test/src/serve_util.rs +++ b/tests/rojo_test/serve_util.rs @@ -14,8 +14,8 @@ use tempfile::{tempdir, TempDir}; use librojo::web_api::{ReadResponse, ServerInfoResponse, SubscribeResponse}; use rojo_insta_ext::RedactionMap; -use crate::util::{ - copy_recursive, get_rojo_path, get_serve_tests_path, get_working_dir_path, KillOnDrop, +use crate::rojo_test::io_util::{ + copy_recursive, get_working_dir_path, KillOnDrop, ROJO_PATH, SERVE_TESTS_PATH, }; /// Convenience method to run a `rojo serve` test. @@ -38,7 +38,11 @@ pub fn run_serve_test(test_name: &str, callback: impl FnOnce(TestServeSession, R let mut settings = insta::Settings::new(); - let snapshot_path = Path::new(env!("CARGO_MANIFEST_DIR")).join("serve-test-snapshots"); + let snapshot_path = Path::new(SERVE_TESTS_PATH) + .parent() + .unwrap() + .join("serve-test-snapshots"); + settings.set_snapshot_path(snapshot_path); settings.set_sort_maps(true); settings.add_redaction(".serverVersion", "[server-version]"); @@ -58,11 +62,9 @@ pub struct TestServeSession { impl TestServeSession { pub fn new(name: &str) -> Self { - let serve_test_path = get_serve_tests_path(); let working_dir = get_working_dir_path(); - let exe_path = get_rojo_path(); - let source_path = serve_test_path.join(name); + let source_path = Path::new(SERVE_TESTS_PATH).join(name); let dir = tempdir().expect("Couldn't create temporary directory"); let project_path = dir.path().join(name); @@ -80,7 +82,7 @@ impl TestServeSession { let port = get_port_number(); let port_string = port.to_string(); - let rojo_process = Command::new(exe_path) + let rojo_process = Command::new(ROJO_PATH) .args(&[ "serve", project_path.to_str().unwrap(), diff --git a/rojo-test/src/build_test.rs b/tests/tests/build.rs similarity index 84% rename from rojo-test/src/build_test.rs rename to tests/tests/build.rs index f0d6424d..2f5fc76a 100644 --- a/rojo-test/src/build_test.rs +++ b/tests/tests/build.rs @@ -3,7 +3,7 @@ use std::{fs, path::Path, process::Command}; use insta::assert_snapshot; use tempfile::tempdir; -use crate::util::{get_build_tests_path, get_rojo_path, get_working_dir_path}; +use crate::rojo_test::io_util::{get_working_dir_path, BUILD_TESTS_PATH, ROJO_PATH}; macro_rules! gen_build_tests { ( $($test_name: ident,)* ) => { @@ -56,17 +56,14 @@ gen_build_tests! { } fn run_build_test(test_name: &str) { - let build_test_path = get_build_tests_path(); let working_dir = get_working_dir_path(); - let input_path = build_test_path.join(test_name); + let input_path = Path::new(BUILD_TESTS_PATH).join(test_name); let output_dir = tempdir().expect("couldn't create temporary directory"); let output_path = output_dir.path().join(format!("{}.rbxmx", test_name)); - let exe_path = get_rojo_path(); - - let status = Command::new(exe_path) + let status = Command::new(ROJO_PATH) .args(&[ "build", input_path.to_str().unwrap(), @@ -84,7 +81,11 @@ fn run_build_test(test_name: &str) { let mut settings = insta::Settings::new(); - let snapshot_path = Path::new(env!("CARGO_MANIFEST_DIR")).join("build-test-snapshots"); + let snapshot_path = Path::new(BUILD_TESTS_PATH) + .parent() + .unwrap() + .join("build-test-snapshots"); + settings.set_snapshot_path(snapshot_path); settings.bind(|| { diff --git a/tests/tests/mod.rs b/tests/tests/mod.rs new file mode 100644 index 00000000..a348e228 --- /dev/null +++ b/tests/tests/mod.rs @@ -0,0 +1,2 @@ +mod build; +mod serve; diff --git a/rojo-test/src/serve_test.rs b/tests/tests/serve.rs similarity index 98% rename from rojo-test/src/serve_test.rs rename to tests/tests/serve.rs index daac30e2..61912275 100644 --- a/rojo-test/src/serve_test.rs +++ b/tests/tests/serve.rs @@ -3,7 +3,7 @@ use std::fs; use insta::assert_yaml_snapshot; use tempfile::tempdir; -use crate::{internable::InternAndRedact, serve_util::run_serve_test}; +use crate::rojo_test::{internable::InternAndRedact, serve_util::run_serve_test}; #[test] fn empty() {