From 93832406271bcba6f177b1ebeb57eb24f072c407 Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Tue, 3 Sep 2019 18:11:28 -0700 Subject: [PATCH] Move rojo-test snapshots into partitioned folders --- .../build_test__client_in_folder.snap | 0 .../build_test__client_init.snap | 0 .../build_test__csv_bug_145.snap | 0 .../build_test__csv_bug_147.snap | 0 .../build_test__csv_in_folder.snap | 0 .../build_test__deep_nesting.snap | 0 .../build_test__gitkeep.snap | 0 .../build_test__init_with_children.snap | 0 .../build_test__json_model_in_folder.snap | 0 .../build_test__json_model_legacy_name.snap | 0 .../build_test__module_in_folder.snap | 0 .../build_test__module_init.snap | 2 +- .../build_test__plain.txt.snap | 0 .../build_test__plain_gitkeep.snap | 0 .../build_test__rbxm_in_folder.snap | 0 .../build_test__rbxmx_in_folder.snap | 2 +- .../build_test__rbxmx_ref.rbxmx.snap | 0 .../build_test__server_in_folder.snap | 0 .../build_test__server_init.snap | 0 .../build_test__txt.snap | 0 .../build_test__txt_in_folder.snap | 0 .../serve_test__empty.snap | 0 rojo-test/src/build_test.rs | 12 ++++++++++-- rojo-test/src/serve_test.rs | 17 ++++++++++++----- 24 files changed, 24 insertions(+), 9 deletions(-) rename rojo-test/{src/snapshots => build-test-snapshots}/build_test__client_in_folder.snap (100%) rename rojo-test/{src/snapshots => build-test-snapshots}/build_test__client_init.snap (100%) rename rojo-test/{src/snapshots => build-test-snapshots}/build_test__csv_bug_145.snap (100%) rename rojo-test/{src/snapshots => build-test-snapshots}/build_test__csv_bug_147.snap (100%) rename rojo-test/{src/snapshots => build-test-snapshots}/build_test__csv_in_folder.snap (100%) rename rojo-test/{src/snapshots => build-test-snapshots}/build_test__deep_nesting.snap (100%) rename rojo-test/{src/snapshots => build-test-snapshots}/build_test__gitkeep.snap (100%) rename rojo-test/{src/snapshots => build-test-snapshots}/build_test__init_with_children.snap (100%) rename rojo-test/{src/snapshots => build-test-snapshots}/build_test__json_model_in_folder.snap (100%) rename rojo-test/{src/snapshots => build-test-snapshots}/build_test__json_model_legacy_name.snap (100%) rename rojo-test/{src/snapshots => build-test-snapshots}/build_test__module_in_folder.snap (100%) rename rojo-test/{src/snapshots => build-test-snapshots}/build_test__module_init.snap (97%) rename rojo-test/{src/snapshots => build-test-snapshots}/build_test__plain.txt.snap (100%) rename rojo-test/{src/snapshots => build-test-snapshots}/build_test__plain_gitkeep.snap (100%) rename rojo-test/{src/snapshots => build-test-snapshots}/build_test__rbxm_in_folder.snap (100%) rename rojo-test/{src/snapshots => build-test-snapshots}/build_test__rbxmx_in_folder.snap (99%) rename rojo-test/{src/snapshots => build-test-snapshots}/build_test__rbxmx_ref.rbxmx.snap (100%) rename rojo-test/{src/snapshots => build-test-snapshots}/build_test__server_in_folder.snap (100%) rename rojo-test/{src/snapshots => build-test-snapshots}/build_test__server_init.snap (100%) rename rojo-test/{src/snapshots => build-test-snapshots}/build_test__txt.snap (100%) rename rojo-test/{src/snapshots => build-test-snapshots}/build_test__txt_in_folder.snap (100%) rename rojo-test/{src/snapshots => serve-test-snapshots}/serve_test__empty.snap (100%) diff --git a/rojo-test/src/snapshots/build_test__client_in_folder.snap b/rojo-test/build-test-snapshots/build_test__client_in_folder.snap similarity index 100% rename from rojo-test/src/snapshots/build_test__client_in_folder.snap rename to rojo-test/build-test-snapshots/build_test__client_in_folder.snap diff --git a/rojo-test/src/snapshots/build_test__client_init.snap b/rojo-test/build-test-snapshots/build_test__client_init.snap similarity index 100% rename from rojo-test/src/snapshots/build_test__client_init.snap rename to rojo-test/build-test-snapshots/build_test__client_init.snap diff --git a/rojo-test/src/snapshots/build_test__csv_bug_145.snap b/rojo-test/build-test-snapshots/build_test__csv_bug_145.snap similarity index 100% rename from rojo-test/src/snapshots/build_test__csv_bug_145.snap rename to rojo-test/build-test-snapshots/build_test__csv_bug_145.snap diff --git a/rojo-test/src/snapshots/build_test__csv_bug_147.snap b/rojo-test/build-test-snapshots/build_test__csv_bug_147.snap similarity index 100% rename from rojo-test/src/snapshots/build_test__csv_bug_147.snap rename to rojo-test/build-test-snapshots/build_test__csv_bug_147.snap diff --git a/rojo-test/src/snapshots/build_test__csv_in_folder.snap b/rojo-test/build-test-snapshots/build_test__csv_in_folder.snap similarity index 100% rename from rojo-test/src/snapshots/build_test__csv_in_folder.snap rename to rojo-test/build-test-snapshots/build_test__csv_in_folder.snap diff --git a/rojo-test/src/snapshots/build_test__deep_nesting.snap b/rojo-test/build-test-snapshots/build_test__deep_nesting.snap similarity index 100% rename from rojo-test/src/snapshots/build_test__deep_nesting.snap rename to rojo-test/build-test-snapshots/build_test__deep_nesting.snap diff --git a/rojo-test/src/snapshots/build_test__gitkeep.snap b/rojo-test/build-test-snapshots/build_test__gitkeep.snap similarity index 100% rename from rojo-test/src/snapshots/build_test__gitkeep.snap rename to rojo-test/build-test-snapshots/build_test__gitkeep.snap diff --git a/rojo-test/src/snapshots/build_test__init_with_children.snap b/rojo-test/build-test-snapshots/build_test__init_with_children.snap similarity index 100% rename from rojo-test/src/snapshots/build_test__init_with_children.snap rename to rojo-test/build-test-snapshots/build_test__init_with_children.snap diff --git a/rojo-test/src/snapshots/build_test__json_model_in_folder.snap b/rojo-test/build-test-snapshots/build_test__json_model_in_folder.snap similarity index 100% rename from rojo-test/src/snapshots/build_test__json_model_in_folder.snap rename to rojo-test/build-test-snapshots/build_test__json_model_in_folder.snap diff --git a/rojo-test/src/snapshots/build_test__json_model_legacy_name.snap b/rojo-test/build-test-snapshots/build_test__json_model_legacy_name.snap similarity index 100% rename from rojo-test/src/snapshots/build_test__json_model_legacy_name.snap rename to rojo-test/build-test-snapshots/build_test__json_model_legacy_name.snap diff --git a/rojo-test/src/snapshots/build_test__module_in_folder.snap b/rojo-test/build-test-snapshots/build_test__module_in_folder.snap similarity index 100% rename from rojo-test/src/snapshots/build_test__module_in_folder.snap rename to rojo-test/build-test-snapshots/build_test__module_in_folder.snap diff --git a/rojo-test/src/snapshots/build_test__module_init.snap b/rojo-test/build-test-snapshots/build_test__module_init.snap similarity index 97% rename from rojo-test/src/snapshots/build_test__module_init.snap rename to rojo-test/build-test-snapshots/build_test__module_init.snap index ce0c3533..e0110640 100644 --- a/rojo-test/src/snapshots/build_test__module_init.snap +++ b/rojo-test/build-test-snapshots/build_test__module_init.snap @@ -11,4 +11,4 @@ expression: contents return "From folder/init.lua" - + \ No newline at end of file diff --git a/rojo-test/src/snapshots/build_test__plain.txt.snap b/rojo-test/build-test-snapshots/build_test__plain.txt.snap similarity index 100% rename from rojo-test/src/snapshots/build_test__plain.txt.snap rename to rojo-test/build-test-snapshots/build_test__plain.txt.snap diff --git a/rojo-test/src/snapshots/build_test__plain_gitkeep.snap b/rojo-test/build-test-snapshots/build_test__plain_gitkeep.snap similarity index 100% rename from rojo-test/src/snapshots/build_test__plain_gitkeep.snap rename to rojo-test/build-test-snapshots/build_test__plain_gitkeep.snap diff --git a/rojo-test/src/snapshots/build_test__rbxm_in_folder.snap b/rojo-test/build-test-snapshots/build_test__rbxm_in_folder.snap similarity index 100% rename from rojo-test/src/snapshots/build_test__rbxm_in_folder.snap rename to rojo-test/build-test-snapshots/build_test__rbxm_in_folder.snap diff --git a/rojo-test/src/snapshots/build_test__rbxmx_in_folder.snap b/rojo-test/build-test-snapshots/build_test__rbxmx_in_folder.snap similarity index 99% rename from rojo-test/src/snapshots/build_test__rbxmx_in_folder.snap rename to rojo-test/build-test-snapshots/build_test__rbxmx_in_folder.snap index 831fba35..c54f6329 100644 --- a/rojo-test/src/snapshots/build_test__rbxmx_in_folder.snap +++ b/rojo-test/build-test-snapshots/build_test__rbxmx_in_folder.snap @@ -38,4 +38,4 @@ expression: contents - + \ No newline at end of file diff --git a/rojo-test/src/snapshots/build_test__rbxmx_ref.rbxmx.snap b/rojo-test/build-test-snapshots/build_test__rbxmx_ref.rbxmx.snap similarity index 100% rename from rojo-test/src/snapshots/build_test__rbxmx_ref.rbxmx.snap rename to rojo-test/build-test-snapshots/build_test__rbxmx_ref.rbxmx.snap diff --git a/rojo-test/src/snapshots/build_test__server_in_folder.snap b/rojo-test/build-test-snapshots/build_test__server_in_folder.snap similarity index 100% rename from rojo-test/src/snapshots/build_test__server_in_folder.snap rename to rojo-test/build-test-snapshots/build_test__server_in_folder.snap diff --git a/rojo-test/src/snapshots/build_test__server_init.snap b/rojo-test/build-test-snapshots/build_test__server_init.snap similarity index 100% rename from rojo-test/src/snapshots/build_test__server_init.snap rename to rojo-test/build-test-snapshots/build_test__server_init.snap diff --git a/rojo-test/src/snapshots/build_test__txt.snap b/rojo-test/build-test-snapshots/build_test__txt.snap similarity index 100% rename from rojo-test/src/snapshots/build_test__txt.snap rename to rojo-test/build-test-snapshots/build_test__txt.snap diff --git a/rojo-test/src/snapshots/build_test__txt_in_folder.snap b/rojo-test/build-test-snapshots/build_test__txt_in_folder.snap similarity index 100% rename from rojo-test/src/snapshots/build_test__txt_in_folder.snap rename to rojo-test/build-test-snapshots/build_test__txt_in_folder.snap diff --git a/rojo-test/src/snapshots/serve_test__empty.snap b/rojo-test/serve-test-snapshots/serve_test__empty.snap similarity index 100% rename from rojo-test/src/snapshots/serve_test__empty.snap rename to rojo-test/serve-test-snapshots/serve_test__empty.snap diff --git a/rojo-test/src/build_test.rs b/rojo-test/src/build_test.rs index 02bee494..341af7af 100644 --- a/rojo-test/src/build_test.rs +++ b/rojo-test/src/build_test.rs @@ -1,4 +1,4 @@ -use std::{fs, process::Command}; +use std::{fs, path::Path, process::Command}; use insta::assert_snapshot; use tempfile::tempdir; @@ -12,6 +12,7 @@ macro_rules! gen_build_tests { #[test] fn []() { let _ = env_logger::try_init(); + run_build_test(stringify!($test_name)); } } @@ -78,5 +79,12 @@ fn run_build_test(test_name: &str) { let contents = fs::read_to_string(&output_path).expect("Couldn't read output file"); - assert_snapshot!(test_name, contents); + let mut settings = insta::Settings::new(); + + let snapshot_path = Path::new(env!("CARGO_MANIFEST_DIR")).join("build-test-snapshots"); + settings.set_snapshot_path(snapshot_path); + + settings.bind(|| { + assert_snapshot!(test_name, contents); + }); } diff --git a/rojo-test/src/serve_test.rs b/rojo-test/src/serve_test.rs index e7855e5d..392d6f9f 100644 --- a/rojo-test/src/serve_test.rs +++ b/rojo-test/src/serve_test.rs @@ -1,6 +1,6 @@ use std::{ fs, - path::PathBuf, + path::{Path, PathBuf}, process::Command, sync::atomic::{AtomicUsize, Ordering}, }; @@ -18,11 +18,18 @@ use crate::util::{ fn empty() { let _ = env_logger::try_init(); - let mut session = TestServeSession::new("empty"); - let info = session.wait_to_come_online(); + let mut settings = insta::Settings::new(); - assert_yaml_snapshot!(info, { - ".sessionId" => "[session id]" + let snapshot_path = Path::new(env!("CARGO_MANIFEST_DIR")).join("serve-test-snapshots"); + settings.set_snapshot_path(snapshot_path); + + settings.bind(|| { + let mut session = TestServeSession::new("empty"); + let info = session.wait_to_come_online(); + + assert_yaml_snapshot!(info, { + ".sessionId" => "[session id]" + }); }); }