diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_absolute_dir@hello.txt.snap b/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_absolute_dir@hello.txt.snap deleted file mode 100644 index f4c2da6e..00000000 --- a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_absolute_dir@hello.txt.snap +++ /dev/null @@ -1,6 +0,0 @@ ---- -source: tests/glob_submodule/mod.rs -expression: "&contents" -input_file: tests/inputs/hello.txt ---- -"Contents of hello" diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_dir_base_path@a__file.txt.snap b/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_dir_base_path@a__file.txt.snap deleted file mode 100644 index 43e4ce8f..00000000 --- a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_dir_base_path@a__file.txt.snap +++ /dev/null @@ -1,7 +0,0 @@ ---- -source: tests/glob_submodule/mod.rs -expression: "&contents" -input_file: tests/inputs-nested/a/file.txt ---- -Hello A - diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_dir_base_path@b__file.txt.snap b/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_dir_base_path@b__file.txt.snap deleted file mode 100644 index 9208fa1f..00000000 --- a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_dir_base_path@b__file.txt.snap +++ /dev/null @@ -1,7 +0,0 @@ ---- -source: tests/glob_submodule/mod.rs -expression: "&contents" -input_file: tests/inputs-nested/b/file.txt ---- -Hello B - diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_glob@a__file.txt.snap b/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_glob@a__file.txt.snap deleted file mode 100644 index 43e4ce8f..00000000 --- a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_glob@a__file.txt.snap +++ /dev/null @@ -1,7 +0,0 @@ ---- -source: tests/glob_submodule/mod.rs -expression: "&contents" -input_file: tests/inputs-nested/a/file.txt ---- -Hello A - diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_glob@b__file.txt.snap b/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_glob@b__file.txt.snap deleted file mode 100644 index 9208fa1f..00000000 --- a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_glob@b__file.txt.snap +++ /dev/null @@ -1,7 +0,0 @@ ---- -source: tests/glob_submodule/mod.rs -expression: "&contents" -input_file: tests/inputs-nested/b/file.txt ---- -Hello B - diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_parent_dir@goodbye.txt.snap b/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_parent_dir@goodbye.txt.snap deleted file mode 100644 index a7d917c8..00000000 --- a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_parent_dir@goodbye.txt.snap +++ /dev/null @@ -1,6 +0,0 @@ ---- -source: tests/glob_submodule/mod.rs -expression: "&contents" -input_file: tests/inputs/goodbye.txt ---- -"Contents of goodbye" diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_base_path@goodbye.txt.snap b/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_base_path@goodbye.txt.snap deleted file mode 100644 index a7d917c8..00000000 --- a/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_base_path@goodbye.txt.snap +++ /dev/null @@ -1,6 +0,0 @@ ---- -source: tests/glob_submodule/mod.rs -expression: "&contents" -input_file: tests/inputs/goodbye.txt ---- -"Contents of goodbye" diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_base_path@hello.txt.snap b/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_base_path@hello.txt.snap deleted file mode 100644 index f4c2da6e..00000000 --- a/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_base_path@hello.txt.snap +++ /dev/null @@ -1,6 +0,0 @@ ---- -source: tests/glob_submodule/mod.rs -expression: "&contents" -input_file: tests/inputs/hello.txt ---- -"Contents of hello" diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_glob@goodbye.txt.snap b/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_glob@goodbye.txt.snap deleted file mode 100644 index a7d917c8..00000000 --- a/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_glob@goodbye.txt.snap +++ /dev/null @@ -1,6 +0,0 @@ ---- -source: tests/glob_submodule/mod.rs -expression: "&contents" -input_file: tests/inputs/goodbye.txt ---- -"Contents of goodbye" diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_glob@hello.txt.snap b/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_glob@hello.txt.snap deleted file mode 100644 index f4c2da6e..00000000 --- a/tests/glob_submodule/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_glob@hello.txt.snap +++ /dev/null @@ -1,6 +0,0 @@ ---- -source: tests/glob_submodule/mod.rs -expression: "&contents" -input_file: tests/inputs/hello.txt ---- -"Contents of hello" diff --git a/tests/test_allow_duplicates.rs b/tests/integration/allow_duplicates.rs similarity index 100% rename from tests/test_allow_duplicates.rs rename to tests/integration/allow_duplicates.rs diff --git a/tests/test_basic.rs b/tests/integration/basic.rs similarity index 100% rename from tests/test_basic.rs rename to tests/integration/basic.rs diff --git a/tests/test_bugs.rs b/tests/integration/bugs.rs similarity index 100% rename from tests/test_bugs.rs rename to tests/integration/bugs.rs diff --git a/tests/test_filters.rs b/tests/integration/filters.rs similarity index 100% rename from tests/test_filters.rs rename to tests/integration/filters.rs diff --git a/tests/test_glob.rs b/tests/integration/glob.rs similarity index 97% rename from tests/test_glob.rs rename to tests/integration/glob.rs index 2585a99a..512601e5 100644 --- a/tests/test_glob.rs +++ b/tests/integration/glob.rs @@ -1,7 +1,5 @@ #![cfg(feature = "glob")] -mod glob_submodule; - #[test] fn test_basic_globbing() { insta::glob!("inputs/*.txt", |path| { diff --git a/tests/glob_submodule/mod.rs b/tests/integration/glob_submodule/mod.rs similarity index 95% rename from tests/glob_submodule/mod.rs rename to tests/integration/glob_submodule/mod.rs index 984ac362..46f07123 100644 --- a/tests/glob_submodule/mod.rs +++ b/tests/integration/glob_submodule/mod.rs @@ -43,7 +43,7 @@ fn test_globs_follow_links_parent_dir_glob() { #[test] fn test_basic_globbing_absolute_dir() { insta::glob!( - concat!(env!("CARGO_MANIFEST_DIR"), "/tests/inputs"), + concat!(env!("CARGO_MANIFEST_DIR"), "/tests/integration/inputs"), "*.txt", |path| { let contents = std::fs::read_to_string(path).unwrap(); diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_absolute_dir@goodbye.txt.snap b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_absolute_dir@goodbye.txt.snap similarity index 65% rename from tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_absolute_dir@goodbye.txt.snap rename to tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_absolute_dir@goodbye.txt.snap index a7d917c8..72e87115 100644 --- a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_absolute_dir@goodbye.txt.snap +++ b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_absolute_dir@goodbye.txt.snap @@ -1,5 +1,5 @@ --- -source: tests/glob_submodule/mod.rs +source: tests/integration/glob_submodule/mod.rs expression: "&contents" input_file: tests/inputs/goodbye.txt --- diff --git a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_parent_dir@hello.txt.snap b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_absolute_dir@hello.txt.snap similarity index 64% rename from tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_parent_dir@hello.txt.snap rename to tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_absolute_dir@hello.txt.snap index f4c2da6e..28280f13 100644 --- a/tests/glob_submodule/snapshots/test_glob__glob_submodule__basic_globbing_parent_dir@hello.txt.snap +++ b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_absolute_dir@hello.txt.snap @@ -1,5 +1,5 @@ --- -source: tests/glob_submodule/mod.rs +source: tests/integration/glob_submodule/mod.rs expression: "&contents" input_file: tests/inputs/hello.txt --- diff --git a/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_nested_parent_dir_base_path@a__file.txt.snap b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_nested_parent_dir_base_path@a__file.txt.snap new file mode 100644 index 00000000..286fd89c --- /dev/null +++ b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_nested_parent_dir_base_path@a__file.txt.snap @@ -0,0 +1,6 @@ +--- +source: tests/integration/glob_submodule/mod.rs +expression: "&contents" +input_file: tests/integration/inputs-nested/a/file.txt +--- +Hello A diff --git a/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_nested_parent_dir_base_path@b__file.txt.snap b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_nested_parent_dir_base_path@b__file.txt.snap new file mode 100644 index 00000000..a0a05231 --- /dev/null +++ b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_nested_parent_dir_base_path@b__file.txt.snap @@ -0,0 +1,6 @@ +--- +source: tests/integration/glob_submodule/mod.rs +expression: "&contents" +input_file: tests/integration/inputs-nested/b/file.txt +--- +Hello B diff --git a/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_nested_parent_glob@a__file.txt.snap b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_nested_parent_glob@a__file.txt.snap new file mode 100644 index 00000000..286fd89c --- /dev/null +++ b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_nested_parent_glob@a__file.txt.snap @@ -0,0 +1,6 @@ +--- +source: tests/integration/glob_submodule/mod.rs +expression: "&contents" +input_file: tests/integration/inputs-nested/a/file.txt +--- +Hello A diff --git a/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_nested_parent_glob@b__file.txt.snap b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_nested_parent_glob@b__file.txt.snap new file mode 100644 index 00000000..a0a05231 --- /dev/null +++ b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_nested_parent_glob@b__file.txt.snap @@ -0,0 +1,6 @@ +--- +source: tests/integration/glob_submodule/mod.rs +expression: "&contents" +input_file: tests/integration/inputs-nested/b/file.txt +--- +Hello B diff --git a/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_parent_dir@goodbye.txt.snap b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_parent_dir@goodbye.txt.snap new file mode 100644 index 00000000..5c68ebe2 --- /dev/null +++ b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_parent_dir@goodbye.txt.snap @@ -0,0 +1,6 @@ +--- +source: tests/integration/glob_submodule/mod.rs +expression: "&contents" +input_file: tests/integration/inputs/goodbye.txt +--- +"Contents of goodbye" diff --git a/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_parent_dir@hello.txt.snap b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_parent_dir@hello.txt.snap new file mode 100644 index 00000000..3270ad51 --- /dev/null +++ b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__basic_globbing_parent_dir@hello.txt.snap @@ -0,0 +1,6 @@ +--- +source: tests/integration/glob_submodule/mod.rs +expression: "&contents" +input_file: tests/integration/inputs/hello.txt +--- +"Contents of hello" diff --git a/tests/integration/glob_submodule/snapshots/integration__glob_submodule__globs_follow_links_parent_dir_base_path@goodbye.txt.snap b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__globs_follow_links_parent_dir_base_path@goodbye.txt.snap new file mode 100644 index 00000000..5c68ebe2 --- /dev/null +++ b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__globs_follow_links_parent_dir_base_path@goodbye.txt.snap @@ -0,0 +1,6 @@ +--- +source: tests/integration/glob_submodule/mod.rs +expression: "&contents" +input_file: tests/integration/inputs/goodbye.txt +--- +"Contents of goodbye" diff --git a/tests/integration/glob_submodule/snapshots/integration__glob_submodule__globs_follow_links_parent_dir_base_path@hello.txt.snap b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__globs_follow_links_parent_dir_base_path@hello.txt.snap new file mode 100644 index 00000000..3270ad51 --- /dev/null +++ b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__globs_follow_links_parent_dir_base_path@hello.txt.snap @@ -0,0 +1,6 @@ +--- +source: tests/integration/glob_submodule/mod.rs +expression: "&contents" +input_file: tests/integration/inputs/hello.txt +--- +"Contents of hello" diff --git a/tests/integration/glob_submodule/snapshots/integration__glob_submodule__globs_follow_links_parent_dir_glob@goodbye.txt.snap b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__globs_follow_links_parent_dir_glob@goodbye.txt.snap new file mode 100644 index 00000000..5c68ebe2 --- /dev/null +++ b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__globs_follow_links_parent_dir_glob@goodbye.txt.snap @@ -0,0 +1,6 @@ +--- +source: tests/integration/glob_submodule/mod.rs +expression: "&contents" +input_file: tests/integration/inputs/goodbye.txt +--- +"Contents of goodbye" diff --git a/tests/integration/glob_submodule/snapshots/integration__glob_submodule__globs_follow_links_parent_dir_glob@hello.txt.snap b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__globs_follow_links_parent_dir_glob@hello.txt.snap new file mode 100644 index 00000000..3270ad51 --- /dev/null +++ b/tests/integration/glob_submodule/snapshots/integration__glob_submodule__globs_follow_links_parent_dir_glob@hello.txt.snap @@ -0,0 +1,6 @@ +--- +source: tests/integration/glob_submodule/mod.rs +expression: "&contents" +input_file: tests/integration/inputs/hello.txt +--- +"Contents of hello" diff --git a/tests/test_inline.rs b/tests/integration/inline.rs similarity index 100% rename from tests/test_inline.rs rename to tests/integration/inline.rs diff --git a/tests/inputs-nested/a/file.txt b/tests/integration/inputs-nested/a/file.txt similarity index 100% rename from tests/inputs-nested/a/file.txt rename to tests/integration/inputs-nested/a/file.txt diff --git a/tests/inputs-nested/b/file.txt b/tests/integration/inputs-nested/b/file.txt similarity index 100% rename from tests/inputs-nested/b/file.txt rename to tests/integration/inputs-nested/b/file.txt diff --git a/tests/inputs/goodbye.txt b/tests/integration/inputs/goodbye.txt similarity index 100% rename from tests/inputs/goodbye.txt rename to tests/integration/inputs/goodbye.txt diff --git a/tests/inputs/hello.txt b/tests/integration/inputs/hello.txt similarity index 100% rename from tests/inputs/hello.txt rename to tests/integration/inputs/hello.txt diff --git a/tests/link-to-inputs b/tests/integration/link-to-inputs similarity index 100% rename from tests/link-to-inputs rename to tests/integration/link-to-inputs diff --git a/tests/integration/main.rs b/tests/integration/main.rs new file mode 100644 index 00000000..ed21a675 --- /dev/null +++ b/tests/integration/main.rs @@ -0,0 +1,10 @@ +mod allow_duplicates; +mod basic; +mod bugs; +mod filters; +mod glob; +mod glob_submodule; +mod inline; +mod redaction; +mod settings; +mod suffixes; diff --git a/tests/test_redaction.rs b/tests/integration/redaction.rs similarity index 100% rename from tests/test_redaction.rs rename to tests/integration/redaction.rs diff --git a/tests/test_settings.rs b/tests/integration/settings.rs similarity index 100% rename from tests/test_settings.rs rename to tests/integration/settings.rs diff --git a/tests/snapshots/snapshot_no_module_prepending.snap b/tests/integration/snapshots/integration__basic__debug_vector.snap similarity index 63% rename from tests/snapshots/snapshot_no_module_prepending.snap rename to tests/integration/snapshots/integration__basic__debug_vector.snap index 0dc875c5..0320c751 100644 --- a/tests/snapshots/snapshot_no_module_prepending.snap +++ b/tests/integration/snapshots/integration__basic__debug_vector.snap @@ -1,5 +1,5 @@ --- -source: tests/test_settings.rs +source: tests/integration/basic.rs expression: "vec![1, 2, 3]" --- [ diff --git a/tests/snapshots/test_basic__display.snap b/tests/integration/snapshots/integration__basic__display.snap similarity index 54% rename from tests/snapshots/test_basic__display.snap rename to tests/integration/snapshots/integration__basic__display.snap index 5e27768b..960c6d88 100644 --- a/tests/snapshots/test_basic__display.snap +++ b/tests/integration/snapshots/integration__basic__display.snap @@ -1,5 +1,5 @@ --- -source: tests/test_basic.rs +source: tests/integration/basic.rs expression: td --- TestDisplay struct diff --git a/tests/snapshots/test_basic__insta_sort_order.snap b/tests/integration/snapshots/integration__basic__insta_sort_order.snap similarity index 74% rename from tests/snapshots/test_basic__insta_sort_order.snap rename to tests/integration/snapshots/integration__basic__insta_sort_order.snap index 472d1d7d..a9768bac 100644 --- a/tests/snapshots/test_basic__insta_sort_order.snap +++ b/tests/integration/snapshots/integration__basic__insta_sort_order.snap @@ -1,5 +1,5 @@ --- -source: tests/test_basic.rs +source: tests/integration/basic.rs expression: m --- ? - 1 @@ -17,4 +17,3 @@ expression: m ? - 9 - 3 : 4 - diff --git a/tests/snapshots/test_basic__unnamed_json_vector.snap b/tests/integration/snapshots/integration__basic__json_vector.snap similarity index 60% rename from tests/snapshots/test_basic__unnamed_json_vector.snap rename to tests/integration/snapshots/integration__basic__json_vector.snap index b109d7ff..16af7f80 100644 --- a/tests/snapshots/test_basic__unnamed_json_vector.snap +++ b/tests/integration/snapshots/integration__basic__json_vector.snap @@ -1,5 +1,5 @@ --- -source: tests/test_basic.rs +source: tests/integration/basic.rs expression: "vec![1, 2, 3]" --- [ diff --git a/tests/snapshots/test_basic__nested__nested_module.snap b/tests/integration/snapshots/integration__basic__nested__nested_module.snap similarity index 50% rename from tests/snapshots/test_basic__nested__nested_module.snap rename to tests/integration/snapshots/integration__basic__nested__nested_module.snap index 8bb5a733..45147113 100644 --- a/tests/snapshots/test_basic__nested__nested_module.snap +++ b/tests/integration/snapshots/integration__basic__nested__nested_module.snap @@ -1,5 +1,5 @@ --- -source: tests/test_basic.rs +source: tests/integration/basic.rs expression: "\"aoeu\"" --- aoeu diff --git a/tests/snapshots/test_basic__unnamed_debug_vector-2.snap b/tests/integration/snapshots/integration__basic__unnamed_debug_vector-2.snap similarity index 66% rename from tests/snapshots/test_basic__unnamed_debug_vector-2.snap rename to tests/integration/snapshots/integration__basic__unnamed_debug_vector-2.snap index 8e84e06f..d1a5663a 100644 --- a/tests/snapshots/test_basic__unnamed_debug_vector-2.snap +++ b/tests/integration/snapshots/integration__basic__unnamed_debug_vector-2.snap @@ -1,5 +1,5 @@ --- -source: tests/test_basic.rs +source: tests/integration/basic.rs expression: "vec![1, 2, 3, 4]" --- [ diff --git a/tests/snapshots/test_basic__unnamed_debug_vector-3.snap b/tests/integration/snapshots/integration__basic__unnamed_debug_vector-3.snap similarity index 69% rename from tests/snapshots/test_basic__unnamed_debug_vector-3.snap rename to tests/integration/snapshots/integration__basic__unnamed_debug_vector-3.snap index bff9e210..0a2b8051 100644 --- a/tests/snapshots/test_basic__unnamed_debug_vector-3.snap +++ b/tests/integration/snapshots/integration__basic__unnamed_debug_vector-3.snap @@ -1,5 +1,5 @@ --- -source: tests/test_basic.rs +source: tests/integration/basic.rs expression: "vec![1, 2, 3, 4, 5]" --- [ diff --git a/tests/snapshots/test_basic__debug_vector.snap b/tests/integration/snapshots/integration__basic__unnamed_debug_vector.snap similarity index 63% rename from tests/snapshots/test_basic__debug_vector.snap rename to tests/integration/snapshots/integration__basic__unnamed_debug_vector.snap index e9f85e09..0320c751 100644 --- a/tests/snapshots/test_basic__debug_vector.snap +++ b/tests/integration/snapshots/integration__basic__unnamed_debug_vector.snap @@ -1,5 +1,5 @@ --- -source: tests/test_basic.rs +source: tests/integration/basic.rs expression: "vec![1, 2, 3]" --- [ diff --git a/tests/snapshots/test_basic__unnamed_display-2.snap b/tests/integration/snapshots/integration__basic__unnamed_display-2.snap similarity index 55% rename from tests/snapshots/test_basic__unnamed_display-2.snap rename to tests/integration/snapshots/integration__basic__unnamed_display-2.snap index 3e8d2628..7d4167a2 100644 --- a/tests/snapshots/test_basic__unnamed_display-2.snap +++ b/tests/integration/snapshots/integration__basic__unnamed_display-2.snap @@ -1,5 +1,5 @@ --- -source: tests/test_basic.rs +source: tests/integration/basic.rs expression: "\"whatever\"" --- whatever diff --git a/tests/snapshots/test_basic__unnamed_display.snap b/tests/integration/snapshots/integration__basic__unnamed_display.snap similarity index 54% rename from tests/snapshots/test_basic__unnamed_display.snap rename to tests/integration/snapshots/integration__basic__unnamed_display.snap index 5e27768b..960c6d88 100644 --- a/tests/snapshots/test_basic__unnamed_display.snap +++ b/tests/integration/snapshots/integration__basic__unnamed_display.snap @@ -1,5 +1,5 @@ --- -source: tests/test_basic.rs +source: tests/integration/basic.rs expression: td --- TestDisplay struct diff --git a/tests/snapshots/test_basic__unnamed_json_vector-2.snap b/tests/integration/snapshots/integration__basic__unnamed_json_vector-2.snap similarity index 63% rename from tests/snapshots/test_basic__unnamed_json_vector-2.snap rename to tests/integration/snapshots/integration__basic__unnamed_json_vector-2.snap index 188511ef..c53149a3 100644 --- a/tests/snapshots/test_basic__unnamed_json_vector-2.snap +++ b/tests/integration/snapshots/integration__basic__unnamed_json_vector-2.snap @@ -1,5 +1,5 @@ --- -source: tests/test_basic.rs +source: tests/integration/basic.rs expression: "vec![1, 2, 3, 4]" --- [ diff --git a/tests/snapshots/test_basic__unnamed_json_vector-3.snap b/tests/integration/snapshots/integration__basic__unnamed_json_vector-3.snap similarity index 66% rename from tests/snapshots/test_basic__unnamed_json_vector-3.snap rename to tests/integration/snapshots/integration__basic__unnamed_json_vector-3.snap index 81c987d7..4a365c99 100644 --- a/tests/snapshots/test_basic__unnamed_json_vector-3.snap +++ b/tests/integration/snapshots/integration__basic__unnamed_json_vector-3.snap @@ -1,5 +1,5 @@ --- -source: tests/test_basic.rs +source: tests/integration/basic.rs expression: "vec![1, 2, 3, 4, 5]" --- [ diff --git a/tests/snapshots/test_basic__json_vector.snap b/tests/integration/snapshots/integration__basic__unnamed_json_vector.snap similarity index 60% rename from tests/snapshots/test_basic__json_vector.snap rename to tests/integration/snapshots/integration__basic__unnamed_json_vector.snap index b109d7ff..16af7f80 100644 --- a/tests/snapshots/test_basic__json_vector.snap +++ b/tests/integration/snapshots/integration__basic__unnamed_json_vector.snap @@ -1,5 +1,5 @@ --- -source: tests/test_basic.rs +source: tests/integration/basic.rs expression: "vec![1, 2, 3]" --- [ diff --git a/tests/snapshots/test_basic__unnamed_debug_vector.snap b/tests/integration/snapshots/integration__basic__unnamed_nested_closure.snap similarity index 63% rename from tests/snapshots/test_basic__unnamed_debug_vector.snap rename to tests/integration/snapshots/integration__basic__unnamed_nested_closure.snap index e9f85e09..0320c751 100644 --- a/tests/snapshots/test_basic__unnamed_debug_vector.snap +++ b/tests/integration/snapshots/integration__basic__unnamed_nested_closure.snap @@ -1,5 +1,5 @@ --- -source: tests/test_basic.rs +source: tests/integration/basic.rs expression: "vec![1, 2, 3]" --- [ diff --git a/tests/snapshots/test_basic__unnamed_yaml_vector-2.snap b/tests/integration/snapshots/integration__basic__unnamed_yaml_vector-2.snap similarity index 61% rename from tests/snapshots/test_basic__unnamed_yaml_vector-2.snap rename to tests/integration/snapshots/integration__basic__unnamed_yaml_vector-2.snap index ae7ebe8f..f9da8e6e 100644 --- a/tests/snapshots/test_basic__unnamed_yaml_vector-2.snap +++ b/tests/integration/snapshots/integration__basic__unnamed_yaml_vector-2.snap @@ -1,9 +1,8 @@ --- -source: tests/test_basic.rs +source: tests/integration/basic.rs expression: "vec![1, 2, 3, 4]" --- - 1 - 2 - 3 - 4 - diff --git a/tests/snapshots/test_basic__unnamed_yaml_vector-3.snap b/tests/integration/snapshots/integration__basic__unnamed_yaml_vector-3.snap similarity index 63% rename from tests/snapshots/test_basic__unnamed_yaml_vector-3.snap rename to tests/integration/snapshots/integration__basic__unnamed_yaml_vector-3.snap index dfedd920..bd00e47e 100644 --- a/tests/snapshots/test_basic__unnamed_yaml_vector-3.snap +++ b/tests/integration/snapshots/integration__basic__unnamed_yaml_vector-3.snap @@ -1,5 +1,5 @@ --- -source: tests/test_basic.rs +source: tests/integration/basic.rs expression: "vec![1, 2, 3, 4, 5]" --- - 1 @@ -7,4 +7,3 @@ expression: "vec![1, 2, 3, 4, 5]" - 3 - 4 - 5 - diff --git a/tests/snapshots/test_basic__unnamed_yaml_vector.snap b/tests/integration/snapshots/integration__basic__unnamed_yaml_vector.snap similarity index 57% rename from tests/snapshots/test_basic__unnamed_yaml_vector.snap rename to tests/integration/snapshots/integration__basic__unnamed_yaml_vector.snap index bd213c35..6264e076 100644 --- a/tests/snapshots/test_basic__unnamed_yaml_vector.snap +++ b/tests/integration/snapshots/integration__basic__unnamed_yaml_vector.snap @@ -1,8 +1,7 @@ --- -source: tests/test_basic.rs +source: tests/integration/basic.rs expression: "vec![1, 2, 3]" --- - 1 - 2 - 3 - diff --git a/tests/snapshots/test_basic__yaml_vector.snap b/tests/integration/snapshots/integration__basic__yaml_vector.snap similarity index 57% rename from tests/snapshots/test_basic__yaml_vector.snap rename to tests/integration/snapshots/integration__basic__yaml_vector.snap index bd213c35..6264e076 100644 --- a/tests/snapshots/test_basic__yaml_vector.snap +++ b/tests/integration/snapshots/integration__basic__yaml_vector.snap @@ -1,8 +1,7 @@ --- -source: tests/test_basic.rs +source: tests/integration/basic.rs expression: "vec![1, 2, 3]" --- - 1 - 2 - 3 - diff --git a/tests/snapshots/test_bugs__crlf.snap b/tests/integration/snapshots/integration__bugs__crlf.snap similarity index 63% rename from tests/snapshots/test_bugs__crlf.snap rename to tests/integration/snapshots/integration__bugs__crlf.snap index e92bbd48..efd3c442 100644 --- a/tests/snapshots/test_bugs__crlf.snap +++ b/tests/integration/snapshots/integration__bugs__crlf.snap @@ -1,5 +1,5 @@ --- -source: tests/test_bugs.rs +source: tests/integration/bugs.rs expression: "\"foo\\r\\nbar\\r\\nbaz\"" --- foo diff --git a/tests/snapshots/test_bugs__trailing_crlf.snap b/tests/integration/snapshots/integration__bugs__trailing_crlf.snap similarity index 66% rename from tests/snapshots/test_bugs__trailing_crlf.snap rename to tests/integration/snapshots/integration__bugs__trailing_crlf.snap index ad8e753e..7a6b43b4 100644 --- a/tests/snapshots/test_bugs__trailing_crlf.snap +++ b/tests/integration/snapshots/integration__bugs__trailing_crlf.snap @@ -1,8 +1,7 @@ --- -source: tests/test_bugs.rs +source: tests/integration/bugs.rs expression: "\"foo\\r\\nbar\\r\\nbaz\\r\\n\"" --- foo bar baz - diff --git a/tests/integration/snapshots/integration__glob__basic_globbing@goodbye.txt.snap b/tests/integration/snapshots/integration__glob__basic_globbing@goodbye.txt.snap new file mode 100644 index 00000000..f8b586d0 --- /dev/null +++ b/tests/integration/snapshots/integration__glob__basic_globbing@goodbye.txt.snap @@ -0,0 +1,6 @@ +--- +source: tests/integration/glob.rs +expression: "&contents" +input_file: tests/integration/inputs/goodbye.txt +--- +"Contents of goodbye" diff --git a/tests/integration/snapshots/integration__glob__basic_globbing@hello.txt.snap b/tests/integration/snapshots/integration__glob__basic_globbing@hello.txt.snap new file mode 100644 index 00000000..7813b81b --- /dev/null +++ b/tests/integration/snapshots/integration__glob__basic_globbing@hello.txt.snap @@ -0,0 +1,6 @@ +--- +source: tests/integration/glob.rs +expression: "&contents" +input_file: tests/integration/inputs/hello.txt +--- +"Contents of hello" diff --git a/tests/integration/snapshots/integration__glob__basic_globbing_nested@a__file.txt.snap b/tests/integration/snapshots/integration__glob__basic_globbing_nested@a__file.txt.snap new file mode 100644 index 00000000..aab644d6 --- /dev/null +++ b/tests/integration/snapshots/integration__glob__basic_globbing_nested@a__file.txt.snap @@ -0,0 +1,6 @@ +--- +source: tests/integration/glob.rs +expression: "&contents" +input_file: tests/integration/inputs-nested/a/file.txt +--- +Hello A diff --git a/tests/integration/snapshots/integration__glob__basic_globbing_nested@b__file.txt.snap b/tests/integration/snapshots/integration__glob__basic_globbing_nested@b__file.txt.snap new file mode 100644 index 00000000..a45d5628 --- /dev/null +++ b/tests/integration/snapshots/integration__glob__basic_globbing_nested@b__file.txt.snap @@ -0,0 +1,6 @@ +--- +source: tests/integration/glob.rs +expression: "&contents" +input_file: tests/integration/inputs-nested/b/file.txt +--- +Hello B diff --git a/tests/integration/snapshots/integration__glob__globs_follow_links@goodbye.txt.snap b/tests/integration/snapshots/integration__glob__globs_follow_links@goodbye.txt.snap new file mode 100644 index 00000000..f8b586d0 --- /dev/null +++ b/tests/integration/snapshots/integration__glob__globs_follow_links@goodbye.txt.snap @@ -0,0 +1,6 @@ +--- +source: tests/integration/glob.rs +expression: "&contents" +input_file: tests/integration/inputs/goodbye.txt +--- +"Contents of goodbye" diff --git a/tests/integration/snapshots/integration__glob__globs_follow_links@hello.txt.snap b/tests/integration/snapshots/integration__glob__globs_follow_links@hello.txt.snap new file mode 100644 index 00000000..7813b81b --- /dev/null +++ b/tests/integration/snapshots/integration__glob__globs_follow_links@hello.txt.snap @@ -0,0 +1,6 @@ +--- +source: tests/integration/glob.rs +expression: "&contents" +input_file: tests/integration/inputs/hello.txt +--- +"Contents of hello" diff --git a/tests/snapshots/test_inline__unnamed_single_line-2.snap b/tests/integration/snapshots/integration__inline__unnamed_single_line-2.snap similarity index 56% rename from tests/snapshots/test_inline__unnamed_single_line-2.snap rename to tests/integration/snapshots/integration__inline__unnamed_single_line-2.snap index 01270986..a38d1523 100644 --- a/tests/snapshots/test_inline__unnamed_single_line-2.snap +++ b/tests/integration/snapshots/integration__inline__unnamed_single_line-2.snap @@ -1,5 +1,5 @@ --- -source: tests/test_inline.rs +source: tests/integration/inline.rs expression: "\"Testing-2\"" --- Testing-2 diff --git a/tests/snapshots/test_inline__unnamed_single_line.snap b/tests/integration/snapshots/integration__inline__unnamed_single_line.snap similarity index 53% rename from tests/snapshots/test_inline__unnamed_single_line.snap rename to tests/integration/snapshots/integration__inline__unnamed_single_line.snap index b0b18d17..328e93dc 100644 --- a/tests/snapshots/test_inline__unnamed_single_line.snap +++ b/tests/integration/snapshots/integration__inline__unnamed_single_line.snap @@ -1,5 +1,5 @@ --- -source: tests/test_inline.rs +source: tests/integration/inline.rs expression: "\"Testing\"" --- Testing diff --git a/tests/snapshots/test_inline__unnamed_thread_single_line-2.snap b/tests/integration/snapshots/integration__inline__unnamed_thread_single_line-2.snap similarity index 62% rename from tests/snapshots/test_inline__unnamed_thread_single_line-2.snap rename to tests/integration/snapshots/integration__inline__unnamed_thread_single_line-2.snap index 506eaaa6..4e3789b3 100644 --- a/tests/snapshots/test_inline__unnamed_thread_single_line-2.snap +++ b/tests/integration/snapshots/integration__inline__unnamed_thread_single_line-2.snap @@ -1,5 +1,5 @@ --- -source: tests/test_inline.rs +source: tests/integration/inline.rs expression: "\"Testing-thread-2\"" --- Testing-thread-2 diff --git a/tests/snapshots/test_inline__unnamed_thread_single_line.snap b/tests/integration/snapshots/integration__inline__unnamed_thread_single_line.snap similarity index 60% rename from tests/snapshots/test_inline__unnamed_thread_single_line.snap rename to tests/integration/snapshots/integration__inline__unnamed_thread_single_line.snap index f0727bc0..f6207748 100644 --- a/tests/snapshots/test_inline__unnamed_thread_single_line.snap +++ b/tests/integration/snapshots/integration__inline__unnamed_thread_single_line.snap @@ -1,5 +1,5 @@ --- -source: tests/test_inline.rs +source: tests/integration/inline.rs expression: "\"Testing-thread\"" --- Testing-thread diff --git a/tests/snapshots/test_redaction__foo_bar.snap b/tests/integration/snapshots/integration__redaction__foo_bar.snap similarity index 85% rename from tests/snapshots/test_redaction__foo_bar.snap rename to tests/integration/snapshots/integration__redaction__foo_bar.snap index 6ff00a89..95d30735 100644 --- a/tests/snapshots/test_redaction__foo_bar.snap +++ b/tests/integration/snapshots/integration__redaction__foo_bar.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "Selector::parse(\".foo.bar\").unwrap()" --- Selector { diff --git a/tests/snapshots/test_redaction__foo_bar_alt.snap b/tests/integration/snapshots/integration__redaction__foo_bar_alt.snap similarity index 85% rename from tests/snapshots/test_redaction__foo_bar_alt.snap rename to tests/integration/snapshots/integration__redaction__foo_bar_alt.snap index e5d3ec16..f76222c1 100644 --- a/tests/snapshots/test_redaction__foo_bar_alt.snap +++ b/tests/integration/snapshots/integration__redaction__foo_bar_alt.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "Selector::parse(\".foo[\\\"bar\\\"]\").unwrap()" --- Selector { diff --git a/tests/snapshots/test_redaction__foo_bar_deep.snap b/tests/integration/snapshots/integration__redaction__foo_bar_deep.snap similarity index 86% rename from tests/snapshots/test_redaction__foo_bar_deep.snap rename to tests/integration/snapshots/integration__redaction__foo_bar_deep.snap index ec936413..f8033bcb 100644 --- a/tests/snapshots/test_redaction__foo_bar_deep.snap +++ b/tests/integration/snapshots/integration__redaction__foo_bar_deep.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "Selector::parse(\".foo.bar.**\").unwrap()" --- Selector { diff --git a/tests/snapshots/test_redaction__foo_bar_full_range.snap b/tests/integration/snapshots/integration__redaction__foo_bar_full_range.snap similarity index 88% rename from tests/snapshots/test_redaction__foo_bar_full_range.snap rename to tests/integration/snapshots/integration__redaction__foo_bar_full_range.snap index 78432977..29340efc 100644 --- a/tests/snapshots/test_redaction__foo_bar_full_range.snap +++ b/tests/integration/snapshots/integration__redaction__foo_bar_full_range.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "Selector::parse(\".foo.bar[]\").unwrap()" --- Selector { diff --git a/tests/snapshots/test_redaction__foo_bar_range.snap b/tests/integration/snapshots/integration__redaction__foo_bar_range.snap similarity index 91% rename from tests/snapshots/test_redaction__foo_bar_range.snap rename to tests/integration/snapshots/integration__redaction__foo_bar_range.snap index 6b2d8c37..07463432 100644 --- a/tests/snapshots/test_redaction__foo_bar_range.snap +++ b/tests/integration/snapshots/integration__redaction__foo_bar_range.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "Selector::parse(\".foo.bar[10:20]\").unwrap()" --- Selector { diff --git a/tests/snapshots/test_redaction__foo_bar_range_from.snap b/tests/integration/snapshots/integration__redaction__foo_bar_range_from.snap similarity index 90% rename from tests/snapshots/test_redaction__foo_bar_range_from.snap rename to tests/integration/snapshots/integration__redaction__foo_bar_range_from.snap index 1ec6ad90..d7fb3238 100644 --- a/tests/snapshots/test_redaction__foo_bar_range_from.snap +++ b/tests/integration/snapshots/integration__redaction__foo_bar_range_from.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "Selector::parse(\".foo.bar[10:]\").unwrap()" --- Selector { diff --git a/tests/snapshots/test_redaction__foo_bar_range_to.snap b/tests/integration/snapshots/integration__redaction__foo_bar_range_to.snap similarity index 90% rename from tests/snapshots/test_redaction__foo_bar_range_to.snap rename to tests/integration/snapshots/integration__redaction__foo_bar_range_to.snap index 45e346dd..0b77eca1 100644 --- a/tests/snapshots/test_redaction__foo_bar_range_to.snap +++ b/tests/integration/snapshots/integration__redaction__foo_bar_range_to.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "Selector::parse(\".foo.bar[:10]\").unwrap()" --- Selector { diff --git a/tests/snapshots/test_redaction__map_key_redaction.snap b/tests/integration/snapshots/integration__redaction__map_key_redaction.snap similarity index 71% rename from tests/snapshots/test_redaction__map_key_redaction.snap rename to tests/integration/snapshots/integration__redaction__map_key_redaction.snap index 9c238d70..fe063aad 100644 --- a/tests/snapshots/test_redaction__map_key_redaction.snap +++ b/tests/integration/snapshots/integration__redaction__map_key_redaction.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: foo_value --- hm: @@ -8,4 +8,3 @@ hm: : 42 btm: "[key]": 23 - diff --git a/tests/snapshots/test_redaction__rounded_redaction.snap b/tests/integration/snapshots/integration__redaction__rounded_redaction.snap similarity index 70% rename from tests/snapshots/test_redaction__rounded_redaction.snap rename to tests/integration/snapshots/integration__redaction__rounded_redaction.snap index e51ea062..006bbb7c 100644 --- a/tests/snapshots/test_redaction__rounded_redaction.snap +++ b/tests/integration/snapshots/integration__redaction__rounded_redaction.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "&MyPoint { x: 1.0 / 3.0, y: 6.0 / 3.0 }" --- { diff --git a/tests/snapshots/test_redaction__struct_array_redaction.snap b/tests/integration/snapshots/integration__redaction__struct_array_redaction.snap similarity index 83% rename from tests/snapshots/test_redaction__struct_array_redaction.snap rename to tests/integration/snapshots/integration__redaction__struct_array_redaction.snap index 5d64eab9..b8cc869a 100644 --- a/tests/snapshots/test_redaction__struct_array_redaction.snap +++ b/tests/integration/snapshots/integration__redaction__struct_array_redaction.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "vec![checkout]" --- - _id: "[checkout_id]" @@ -8,4 +8,3 @@ expression: "vec![checkout]" product_name: "[product_name]" - _id: "[product_id]" product_name: "[product_name]" - diff --git a/tests/snapshots/test_redaction__with_random_value_and_trailing_comma_match.snap b/tests/integration/snapshots/integration__redaction__user.snap similarity index 86% rename from tests/snapshots/test_redaction__with_random_value_and_trailing_comma_match.snap rename to tests/integration/snapshots/integration__redaction__user.snap index 8ab9b42c..1c67e937 100644 --- a/tests/snapshots/test_redaction__with_random_value_and_trailing_comma_match.snap +++ b/tests/integration/snapshots/integration__redaction__user.snap @@ -1,9 +1,8 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "&User {\n id: 11,\n username: \"john_doe\".to_string(),\n email: Email(\"john@example.com\".to_string()),\n extra: \"\".to_string(),\n }" --- id: "[id]" username: john_doe email: john@example.com extra: "" - diff --git a/tests/snapshots/test_redaction__user_csv.snap b/tests/integration/snapshots/integration__redaction__user_csv.snap similarity index 86% rename from tests/snapshots/test_redaction__user_csv.snap rename to tests/integration/snapshots/integration__redaction__user_csv.snap index 06fefc22..82e72dd5 100644 --- a/tests/snapshots/test_redaction__user_csv.snap +++ b/tests/integration/snapshots/integration__redaction__user_csv.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "&User {\n id: 44,\n username: \"julius_csv\".to_string(),\n email: Email(\"julius@example.com\".to_string()),\n extra: \"\".to_string(),\n }" --- id,username,email,extra diff --git a/tests/snapshots/test_redaction__user_json.snap b/tests/integration/snapshots/integration__redaction__user_json.snap similarity index 88% rename from tests/snapshots/test_redaction__user_json.snap rename to tests/integration/snapshots/integration__redaction__user_json.snap index 2da02932..7730581e 100644 --- a/tests/snapshots/test_redaction__user_json.snap +++ b/tests/integration/snapshots/integration__redaction__user_json.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "&User {\n id: 9999,\n username: \"jason_doe\".to_string(),\n email: Email(\"jason@example.com\".to_string()),\n extra: \"ssn goes here\".to_string(),\n }" --- { diff --git a/tests/snapshots/test_redaction__user_json_flags.snap b/tests/integration/snapshots/integration__redaction__user_json_flags.snap similarity index 89% rename from tests/snapshots/test_redaction__user_json_flags.snap rename to tests/integration/snapshots/integration__redaction__user_json_flags.snap index 80f784d3..924ebabc 100644 --- a/tests/snapshots/test_redaction__user_json_flags.snap +++ b/tests/integration/snapshots/integration__redaction__user_json_flags.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "&User {\n id: 122,\n username: \"jason_doe\".to_string(),\n flags: vec![\"zzz\".into(), \"foo\".into(), \"aha\".into(),\n \"is_admin\".into()].into_iter().collect(),\n }" --- { diff --git a/tests/snapshots/test_redaction__user_json_flags_alt.snap b/tests/integration/snapshots/integration__redaction__user_json_flags_alt.snap similarity index 90% rename from tests/snapshots/test_redaction__user_json_flags_alt.snap rename to tests/integration/snapshots/integration__redaction__user_json_flags_alt.snap index 27284572..9146c957 100644 --- a/tests/snapshots/test_redaction__user_json_flags_alt.snap +++ b/tests/integration/snapshots/integration__redaction__user_json_flags_alt.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "&User {\n id: 122,\n username: \"jason_doe\".to_string(),\n flags: MySet(vec![\"zzz\".into(), \"foo\".into(), \"aha\".into(),\n \"is_admin\".into()].into_iter().collect()),\n }" --- { diff --git a/tests/snapshots/test_redaction__user_json_settings.snap b/tests/integration/snapshots/integration__redaction__user_json_settings.snap similarity index 88% rename from tests/snapshots/test_redaction__user_json_settings.snap rename to tests/integration/snapshots/integration__redaction__user_json_settings.snap index 0b9b62ba..01813fe0 100644 --- a/tests/snapshots/test_redaction__user_json_settings.snap +++ b/tests/integration/snapshots/integration__redaction__user_json_settings.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "&User {\n id: 122,\n username: \"jason_doe\".to_string(),\n email: Email(\"jason@example.com\".to_string()),\n extra: \"ssn goes here\".to_string(),\n }" --- { diff --git a/tests/snapshots/test_redaction__user_json_settings_callback.snap b/tests/integration/snapshots/integration__redaction__user_json_settings_callback.snap similarity index 88% rename from tests/snapshots/test_redaction__user_json_settings_callback.snap rename to tests/integration/snapshots/integration__redaction__user_json_settings_callback.snap index 014f4fef..b17c4c47 100644 --- a/tests/snapshots/test_redaction__user_json_settings_callback.snap +++ b/tests/integration/snapshots/integration__redaction__user_json_settings_callback.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "&User {\n id: 1234,\n username: \"jason_doe\".to_string(),\n email: Email(\"jason@example.com\".to_string()),\n extra: \"extra here\".to_string(),\n }" --- { diff --git a/tests/snapshots/test_redaction__with_random_value_ron_match.snap b/tests/integration/snapshots/integration__redaction__user_ron.snap similarity index 87% rename from tests/snapshots/test_redaction__with_random_value_ron_match.snap rename to tests/integration/snapshots/integration__redaction__user_ron.snap index d864ff15..0a4f015f 100644 --- a/tests/snapshots/test_redaction__with_random_value_ron_match.snap +++ b/tests/integration/snapshots/integration__redaction__user_ron.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "&User {\n id: 53,\n username: \"john_ron\".to_string(),\n email: Email(\"john@example.com\".to_string()),\n extra: \"\".to_string(),\n }" --- User( diff --git a/tests/snapshots/test_redaction__user_toml.snap b/tests/integration/snapshots/integration__redaction__user_toml.snap similarity index 87% rename from tests/snapshots/test_redaction__user_toml.snap rename to tests/integration/snapshots/integration__redaction__user_toml.snap index ae77e5e9..5b959530 100644 --- a/tests/snapshots/test_redaction__user_toml.snap +++ b/tests/integration/snapshots/integration__redaction__user_toml.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "&User {\n id: 53,\n username: \"john_ron\".to_string(),\n email: Email(\"john@example.com\".to_string()),\n extra: \"\".to_string(),\n }" --- id = '[id]' diff --git a/tests/snapshots/test_redaction__user.snap b/tests/integration/snapshots/integration__redaction__with_random_value_and_trailing_comma_match.snap similarity index 64% rename from tests/snapshots/test_redaction__user.snap rename to tests/integration/snapshots/integration__redaction__with_random_value_and_trailing_comma_match.snap index 276962e6..1c67e937 100644 --- a/tests/snapshots/test_redaction__user.snap +++ b/tests/integration/snapshots/integration__redaction__with_random_value_and_trailing_comma_match.snap @@ -1,9 +1,8 @@ --- -source: tests/test_redaction.rs -expression: "&User {\n id: 23,\n username: \"john_doe\".to_string(),\n email: Email(\"john@example.com\".to_string()),\n extra: \"\".to_string(),\n }" +source: tests/integration/redaction.rs +expression: "&User {\n id: 11,\n username: \"john_doe\".to_string(),\n email: Email(\"john@example.com\".to_string()),\n extra: \"\".to_string(),\n }" --- id: "[id]" username: john_doe email: john@example.com extra: "" - diff --git a/tests/snapshots/test_redaction__with_random_value_csv_match.snap b/tests/integration/snapshots/integration__redaction__with_random_value_csv_match.snap similarity index 86% rename from tests/snapshots/test_redaction__with_random_value_csv_match.snap rename to tests/integration/snapshots/integration__redaction__with_random_value_csv_match.snap index 06fefc22..82e72dd5 100644 --- a/tests/snapshots/test_redaction__with_random_value_csv_match.snap +++ b/tests/integration/snapshots/integration__redaction__with_random_value_csv_match.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "&User {\n id: 44,\n username: \"julius_csv\".to_string(),\n email: Email(\"julius@example.com\".to_string()),\n extra: \"\".to_string(),\n }" --- id,username,email,extra diff --git a/tests/snapshots/test_redaction__with_random_value_json_match.snap b/tests/integration/snapshots/integration__redaction__with_random_value_json_match.snap similarity index 88% rename from tests/snapshots/test_redaction__with_random_value_json_match.snap rename to tests/integration/snapshots/integration__redaction__with_random_value_json_match.snap index 2da02932..7730581e 100644 --- a/tests/snapshots/test_redaction__with_random_value_json_match.snap +++ b/tests/integration/snapshots/integration__redaction__with_random_value_json_match.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "&User {\n id: 9999,\n username: \"jason_doe\".to_string(),\n email: Email(\"jason@example.com\".to_string()),\n extra: \"ssn goes here\".to_string(),\n }" --- { diff --git a/tests/snapshots/test_redaction__with_random_value_json_settings2.snap b/tests/integration/snapshots/integration__redaction__with_random_value_json_settings2.snap similarity index 88% rename from tests/snapshots/test_redaction__with_random_value_json_settings2.snap rename to tests/integration/snapshots/integration__redaction__with_random_value_json_settings2.snap index 8eb85274..413d89e8 100644 --- a/tests/snapshots/test_redaction__with_random_value_json_settings2.snap +++ b/tests/integration/snapshots/integration__redaction__with_random_value_json_settings2.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "&User {\n id: 975,\n username: \"jason_doe\".to_string(),\n email: Email(\"jason@example.com\".to_string()),\n extra: \"ssn goes here\".to_string(),\n }" --- { diff --git a/tests/snapshots/test_redaction__user_ron.snap b/tests/integration/snapshots/integration__redaction__with_random_value_ron_match.snap similarity index 87% rename from tests/snapshots/test_redaction__user_ron.snap rename to tests/integration/snapshots/integration__redaction__with_random_value_ron_match.snap index d864ff15..0a4f015f 100644 --- a/tests/snapshots/test_redaction__user_ron.snap +++ b/tests/integration/snapshots/integration__redaction__with_random_value_ron_match.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "&User {\n id: 53,\n username: \"john_ron\".to_string(),\n email: Email(\"john@example.com\".to_string()),\n extra: \"\".to_string(),\n }" --- User( diff --git a/tests/snapshots/test_redaction__with_random_value_toml_match.snap b/tests/integration/snapshots/integration__redaction__with_random_value_toml_match.snap similarity index 87% rename from tests/snapshots/test_redaction__with_random_value_toml_match.snap rename to tests/integration/snapshots/integration__redaction__with_random_value_toml_match.snap index ae77e5e9..5b959530 100644 --- a/tests/snapshots/test_redaction__with_random_value_toml_match.snap +++ b/tests/integration/snapshots/integration__redaction__with_random_value_toml_match.snap @@ -1,5 +1,5 @@ --- -source: tests/test_redaction.rs +source: tests/integration/redaction.rs expression: "&User {\n id: 53,\n username: \"john_ron\".to_string(),\n email: Email(\"john@example.com\".to_string()),\n extra: \"\".to_string(),\n }" --- id = '[id]' diff --git a/tests/snapshots/test_settings__snapshot_with_description.snap b/tests/integration/snapshots/integration__settings__snapshot_with_description.snap similarity index 73% rename from tests/snapshots/test_settings__snapshot_with_description.snap rename to tests/integration/snapshots/integration__settings__snapshot_with_description.snap index e94ccdbb..c1d38c3a 100644 --- a/tests/snapshots/test_settings__snapshot_with_description.snap +++ b/tests/integration/snapshots/integration__settings__snapshot_with_description.snap @@ -1,5 +1,5 @@ --- -source: tests/test_settings.rs +source: tests/integration/settings.rs description: The snapshot is three integers expression: "vec![1, 2, 3]" --- diff --git a/tests/snapshots/test_settings__snapshot_with_description_and_info.snap b/tests/integration/snapshots/integration__settings__snapshot_with_description_and_info.snap similarity index 83% rename from tests/snapshots/test_settings__snapshot_with_description_and_info.snap rename to tests/integration/snapshots/integration__settings__snapshot_with_description_and_info.snap index 1e1acd04..ef51cbb0 100644 --- a/tests/snapshots/test_settings__snapshot_with_description_and_info.snap +++ b/tests/integration/snapshots/integration__settings__snapshot_with_description_and_info.snap @@ -1,5 +1,5 @@ --- -source: tests/test_settings.rs +source: tests/integration/settings.rs description: The snapshot is four integers expression: "vec![1, 2, 3, 4]" info: diff --git a/tests/snapshots/test_settings__snapshot_with_description_and_raw_info.snap b/tests/integration/snapshots/integration__settings__snapshot_with_description_and_raw_info.snap similarity index 83% rename from tests/snapshots/test_settings__snapshot_with_description_and_raw_info.snap rename to tests/integration/snapshots/integration__settings__snapshot_with_description_and_raw_info.snap index 14349e18..a37c7d7b 100644 --- a/tests/snapshots/test_settings__snapshot_with_description_and_raw_info.snap +++ b/tests/integration/snapshots/integration__settings__snapshot_with_description_and_raw_info.snap @@ -1,5 +1,5 @@ --- -source: tests/test_settings.rs +source: tests/integration/settings.rs description: The snapshot is four integers expression: "vec![1, 2, 3, 4]" info: diff --git a/tests/integration/snapshots/integration__suffixes__basic_suffixes@1.snap b/tests/integration/snapshots/integration__suffixes__basic_suffixes@1.snap new file mode 100644 index 00000000..4d3f8735 --- /dev/null +++ b/tests/integration/snapshots/integration__suffixes__basic_suffixes@1.snap @@ -0,0 +1,5 @@ +--- +source: tests/integration/suffixes.rs +expression: "&value" +--- +1 diff --git a/tests/integration/snapshots/integration__suffixes__basic_suffixes@2.snap b/tests/integration/snapshots/integration__suffixes__basic_suffixes@2.snap new file mode 100644 index 00000000..b2711fcb --- /dev/null +++ b/tests/integration/snapshots/integration__suffixes__basic_suffixes@2.snap @@ -0,0 +1,5 @@ +--- +source: tests/integration/suffixes.rs +expression: "&value" +--- +2 diff --git a/tests/integration/snapshots/integration__suffixes__basic_suffixes@3.snap b/tests/integration/snapshots/integration__suffixes__basic_suffixes@3.snap new file mode 100644 index 00000000..457844f6 --- /dev/null +++ b/tests/integration/snapshots/integration__suffixes__basic_suffixes@3.snap @@ -0,0 +1,5 @@ +--- +source: tests/integration/suffixes.rs +expression: "&value" +--- +3 diff --git a/tests/snapshots/test_basic__unnamed_nested_closure.snap b/tests/integration/snapshots/snapshot_no_module_prepending.snap similarity index 61% rename from tests/snapshots/test_basic__unnamed_nested_closure.snap rename to tests/integration/snapshots/snapshot_no_module_prepending.snap index e9f85e09..83f4ce3e 100644 --- a/tests/snapshots/test_basic__unnamed_nested_closure.snap +++ b/tests/integration/snapshots/snapshot_no_module_prepending.snap @@ -1,5 +1,5 @@ --- -source: tests/test_basic.rs +source: tests/integration/settings.rs expression: "vec![1, 2, 3]" --- [ diff --git a/tests/integration/snapshots2/integration__settings__snapshot_path.snap b/tests/integration/snapshots2/integration__settings__snapshot_path.snap new file mode 100644 index 00000000..83f4ce3e --- /dev/null +++ b/tests/integration/snapshots2/integration__settings__snapshot_path.snap @@ -0,0 +1,9 @@ +--- +source: tests/integration/settings.rs +expression: "vec![1, 2, 3]" +--- +[ + 1, + 2, + 3, +] diff --git a/tests/test_suffixes.rs b/tests/integration/suffixes.rs similarity index 100% rename from tests/test_suffixes.rs rename to tests/integration/suffixes.rs diff --git a/tests/snapshots/test_glob__basic_globbing@goodbye.txt.snap b/tests/snapshots/test_glob__basic_globbing@goodbye.txt.snap deleted file mode 100644 index a16cfe30..00000000 --- a/tests/snapshots/test_glob__basic_globbing@goodbye.txt.snap +++ /dev/null @@ -1,6 +0,0 @@ ---- -source: tests/test_glob.rs -expression: "&contents" -input_file: tests/inputs/goodbye.txt ---- -"Contents of goodbye" diff --git a/tests/snapshots/test_glob__basic_globbing@hello.txt.snap b/tests/snapshots/test_glob__basic_globbing@hello.txt.snap deleted file mode 100644 index 6f941346..00000000 --- a/tests/snapshots/test_glob__basic_globbing@hello.txt.snap +++ /dev/null @@ -1,6 +0,0 @@ ---- -source: tests/test_glob.rs -expression: "&contents" -input_file: tests/inputs/hello.txt ---- -"Contents of hello" diff --git a/tests/snapshots/test_glob__basic_globbing_nested@a__file.txt.snap b/tests/snapshots/test_glob__basic_globbing_nested@a__file.txt.snap deleted file mode 100644 index 254b4c60..00000000 --- a/tests/snapshots/test_glob__basic_globbing_nested@a__file.txt.snap +++ /dev/null @@ -1,7 +0,0 @@ ---- -source: tests/test_glob.rs -expression: "&contents" -input_file: tests/inputs-nested/a/file.txt ---- -Hello A - diff --git a/tests/snapshots/test_glob__basic_globbing_nested@b__file.txt.snap b/tests/snapshots/test_glob__basic_globbing_nested@b__file.txt.snap deleted file mode 100644 index e6c38641..00000000 --- a/tests/snapshots/test_glob__basic_globbing_nested@b__file.txt.snap +++ /dev/null @@ -1,7 +0,0 @@ ---- -source: tests/test_glob.rs -expression: "&contents" -input_file: tests/inputs-nested/b/file.txt ---- -Hello B - diff --git a/tests/snapshots/test_glob__globs_follow_links@goodbye.txt.snap b/tests/snapshots/test_glob__globs_follow_links@goodbye.txt.snap deleted file mode 100644 index a16cfe30..00000000 --- a/tests/snapshots/test_glob__globs_follow_links@goodbye.txt.snap +++ /dev/null @@ -1,6 +0,0 @@ ---- -source: tests/test_glob.rs -expression: "&contents" -input_file: tests/inputs/goodbye.txt ---- -"Contents of goodbye" diff --git a/tests/snapshots/test_glob__globs_follow_links@hello.txt.snap b/tests/snapshots/test_glob__globs_follow_links@hello.txt.snap deleted file mode 100644 index 6f941346..00000000 --- a/tests/snapshots/test_glob__globs_follow_links@hello.txt.snap +++ /dev/null @@ -1,6 +0,0 @@ ---- -source: tests/test_glob.rs -expression: "&contents" -input_file: tests/inputs/hello.txt ---- -"Contents of hello" diff --git a/tests/snapshots/test_suffixes__basic_suffixes@1.snap b/tests/snapshots/test_suffixes__basic_suffixes@1.snap deleted file mode 100644 index ae952e96..00000000 --- a/tests/snapshots/test_suffixes__basic_suffixes@1.snap +++ /dev/null @@ -1,5 +0,0 @@ ---- -source: tests/test_suffixes.rs -expression: "&value" ---- -1 diff --git a/tests/snapshots/test_suffixes__basic_suffixes@2.snap b/tests/snapshots/test_suffixes__basic_suffixes@2.snap deleted file mode 100644 index 43655f25..00000000 --- a/tests/snapshots/test_suffixes__basic_suffixes@2.snap +++ /dev/null @@ -1,5 +0,0 @@ ---- -source: tests/test_suffixes.rs -expression: "&value" ---- -2 diff --git a/tests/snapshots/test_suffixes__basic_suffixes@3.snap b/tests/snapshots/test_suffixes__basic_suffixes@3.snap deleted file mode 100644 index a8fd7b3e..00000000 --- a/tests/snapshots/test_suffixes__basic_suffixes@3.snap +++ /dev/null @@ -1,5 +0,0 @@ ---- -source: tests/test_suffixes.rs -expression: "&value" ---- -3 diff --git a/tests/snapshots2/test_settings__snapshot_path.snap b/tests/snapshots2/test_settings__snapshot_path.snap deleted file mode 100644 index 0dc875c5..00000000 --- a/tests/snapshots2/test_settings__snapshot_path.snap +++ /dev/null @@ -1,9 +0,0 @@ ---- -source: tests/test_settings.rs -expression: "vec![1, 2, 3]" ---- -[ - 1, - 2, - 3, -]