Integrate integration tests in a single binary

mitsuhiko · Mar 7, 2024 · 2739a20 · 2739a20
1 parent 3cb9934
commit 2739a20
Show file tree

Hide file tree

Showing 111 changed files with 187 additions and 195 deletions.
diff --git a/...submodule/snapshots/test_glob__glob_submodule__basic_globbing_absolute_dir@hello.txt.snap b/...submodule/snapshots/test_glob__glob_submodule__basic_globbing_absolute_dir@hello.txt.snap
diff --git a/...ts/test_glob__glob_submodule__basic_globbing_nested_parent_dir_base_path@a__file.txt.snap b/...ts/test_glob__glob_submodule__basic_globbing_nested_parent_dir_base_path@a__file.txt.snap
diff --git a/...ts/test_glob__glob_submodule__basic_globbing_nested_parent_dir_base_path@b__file.txt.snap b/...ts/test_glob__glob_submodule__basic_globbing_nested_parent_dir_base_path@b__file.txt.snap
diff --git a/...e/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_glob@a__file.txt.snap b/...e/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_glob@a__file.txt.snap
diff --git a/...e/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_glob@b__file.txt.snap b/...e/snapshots/test_glob__glob_submodule__basic_globbing_nested_parent_glob@b__file.txt.snap
diff --git a/...submodule/snapshots/test_glob__glob_submodule__basic_globbing_parent_dir@goodbye.txt.snap b/...submodule/snapshots/test_glob__glob_submodule__basic_globbing_parent_dir@goodbye.txt.snap
diff --git a/...shots/test_glob__glob_submodule__globs_follow_links_parent_dir_base_path@goodbye.txt.snap b/...shots/test_glob__glob_submodule__globs_follow_links_parent_dir_base_path@goodbye.txt.snap
diff --git a/...apshots/test_glob__glob_submodule__globs_follow_links_parent_dir_base_path@hello.txt.snap b/...apshots/test_glob__glob_submodule__globs_follow_links_parent_dir_base_path@hello.txt.snap
diff --git a/.../snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_glob@goodbye.txt.snap b/.../snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_glob@goodbye.txt.snap
diff --git a/...le/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_glob@hello.txt.snap b/...le/snapshots/test_glob__glob_submodule__globs_follow_links_parent_dir_glob@hello.txt.snap
diff --git a/tests/test_allow_duplicates.rs → tests/integration/allow_duplicates.rs b/tests/test_allow_duplicates.rs → tests/integration/allow_duplicates.rs
diff --git a/tests/test_basic.rs → tests/integration/basic.rs b/tests/test_basic.rs → tests/integration/basic.rs
diff --git a/tests/test_bugs.rs → tests/integration/bugs.rs b/tests/test_bugs.rs → tests/integration/bugs.rs
diff --git a/tests/test_filters.rs → tests/integration/filters.rs b/tests/test_filters.rs → tests/integration/filters.rs
diff --git a/tests/test_glob.rs → tests/integration/glob.rs b/tests/test_glob.rs → 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 → tests/integration/glob_submodule/mod.rs b/tests/glob_submodule/mod.rs → 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/[email protected] → [email protected] b/[email protected] → [email protected]
@@ -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/[email protected] → [email protected] b/[email protected] → [email protected]
@@ -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/.../integration__glob_submodule__basic_globbing_nested_parent_dir_base_path@a__file.txt.snap b/.../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/.../integration__glob_submodule__basic_globbing_nested_parent_dir_base_path@b__file.txt.snap b/.../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/...snapshots/integration__glob_submodule__basic_globbing_nested_parent_glob@a__file.txt.snap b/...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/...snapshots/integration__glob_submodule__basic_globbing_nested_parent_glob@b__file.txt.snap b/...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/...bmodule/snapshots/integration__glob_submodule__basic_globbing_parent_dir@goodbye.txt.snap b/...bmodule/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/...submodule/snapshots/integration__glob_submodule__basic_globbing_parent_dir@hello.txt.snap b/...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/...ots/integration__glob_submodule__globs_follow_links_parent_dir_base_path@goodbye.txt.snap b/...ots/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/...shots/integration__glob_submodule__globs_follow_links_parent_dir_base_path@hello.txt.snap b/...shots/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/...napshots/integration__glob_submodule__globs_follow_links_parent_dir_glob@goodbye.txt.snap b/...napshots/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/.../snapshots/integration__glob_submodule__globs_follow_links_parent_dir_glob@hello.txt.snap b/.../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 → tests/integration/inline.rs b/tests/test_inline.rs → tests/integration/inline.rs
diff --git a/tests/inputs-nested/a/file.txt → tests/integration/inputs-nested/a/file.txt b/tests/inputs-nested/a/file.txt → tests/integration/inputs-nested/a/file.txt
diff --git a/tests/inputs-nested/b/file.txt → tests/integration/inputs-nested/b/file.txt b/tests/inputs-nested/b/file.txt → tests/integration/inputs-nested/b/file.txt
diff --git a/tests/inputs/goodbye.txt → tests/integration/inputs/goodbye.txt b/tests/inputs/goodbye.txt → tests/integration/inputs/goodbye.txt
diff --git a/tests/inputs/hello.txt → tests/integration/inputs/hello.txt b/tests/inputs/hello.txt → tests/integration/inputs/hello.txt
diff --git a/tests/link-to-inputs → tests/integration/link-to-inputs b/tests/link-to-inputs → tests/integration/link-to-inputs
diff --git a/tests/integration/main.rs 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 → tests/integration/redaction.rs b/tests/test_redaction.rs → tests/integration/redaction.rs
diff --git a/tests/test_settings.rs → tests/integration/settings.rs b/tests/test_settings.rs → tests/integration/settings.rs
diff --git a/...pshots/snapshot_no_module_prepending.snap → ...ots/integration__basic__debug_vector.snap b/...pshots/snapshot_no_module_prepending.snap → ...ots/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 → ...napshots/integration__basic__display.snap b/tests/snapshots/test_basic__display.snap → ...napshots/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/...apshots/test_basic__insta_sort_order.snap → ...integration__basic__insta_sort_order.snap b/...apshots/test_basic__insta_sort_order.snap → ...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/...hots/test_basic__unnamed_json_vector.snap → ...hots/integration__basic__json_vector.snap b/...hots/test_basic__unnamed_json_vector.snap → ...hots/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/...ts/test_basic__nested__nested_module.snap → ...ration__basic__nested__nested_module.snap b/...ts/test_basic__nested__nested_module.snap → ...ration__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/...s/test_basic__unnamed_debug_vector-2.snap → ...ation__basic__unnamed_debug_vector-2.snap b/...s/test_basic__unnamed_debug_vector-2.snap → ...ation__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/...s/test_basic__unnamed_debug_vector-3.snap → ...ation__basic__unnamed_debug_vector-3.snap b/...s/test_basic__unnamed_debug_vector-3.snap → ...ation__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/...s/snapshots/test_basic__debug_vector.snap → ...gration__basic__unnamed_debug_vector.snap b/...s/snapshots/test_basic__debug_vector.snap → ...gration__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/...pshots/test_basic__unnamed_display-2.snap → ...ntegration__basic__unnamed_display-2.snap b/...pshots/test_basic__unnamed_display-2.snap → ...ntegration__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/...napshots/test_basic__unnamed_display.snap → .../integration__basic__unnamed_display.snap b/...napshots/test_basic__unnamed_display.snap → .../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/...ts/test_basic__unnamed_json_vector-2.snap → ...ration__basic__unnamed_json_vector-2.snap b/...ts/test_basic__unnamed_json_vector-2.snap → ...ration__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/...ts/test_basic__unnamed_json_vector-3.snap → ...ration__basic__unnamed_json_vector-3.snap b/...ts/test_basic__unnamed_json_vector-3.snap → ...ration__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 → ...egration__basic__unnamed_json_vector.snap b/tests/snapshots/test_basic__json_vector.snap → ...egration__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/...ots/test_basic__unnamed_debug_vector.snap → ...ation__basic__unnamed_nested_closure.snap b/...ots/test_basic__unnamed_debug_vector.snap → ...ation__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/...ts/test_basic__unnamed_yaml_vector-2.snap → ...ration__basic__unnamed_yaml_vector-2.snap b/...ts/test_basic__unnamed_yaml_vector-2.snap → ...ration__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/...ts/test_basic__unnamed_yaml_vector-3.snap → ...ration__basic__unnamed_yaml_vector-3.snap b/...ts/test_basic__unnamed_yaml_vector-3.snap → ...ration__basic__unnamed_yaml_vector-3.snap
@@ -1,10 +1,9 @@
 ---
-source: tests/test_basic.rs
+source: tests/integration/basic.rs
 expression: "vec![1, 2, 3, 4, 5]"
 ---
 - 1
 - 2
 - 3
 - 4
 - 5
-
diff --git a/...hots/test_basic__unnamed_yaml_vector.snap → ...egration__basic__unnamed_yaml_vector.snap b/...hots/test_basic__unnamed_yaml_vector.snap → ...egration__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 → ...hots/integration__basic__yaml_vector.snap b/tests/snapshots/test_basic__yaml_vector.snap → ...hots/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 → ...on/snapshots/integration__bugs__crlf.snap b/tests/snapshots/test_bugs__crlf.snap → ...on/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/...s/snapshots/test_bugs__trailing_crlf.snap → ...ots/integration__bugs__trailing_crlf.snap b/...s/snapshots/test_bugs__trailing_crlf.snap → ...ots/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/[email protected] b/tests/integration/snapshots/[email protected]
@@ -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/[email protected] b/tests/integration/snapshots/[email protected]
@@ -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
@@ -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
@@ -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/[email protected] b/tests/integration/snapshots/[email protected]
@@ -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/[email protected] b/tests/integration/snapshots/[email protected]
@@ -0,0 +1,6 @@
+---
+source: tests/integration/glob.rs
+expression: "&contents"
+input_file: tests/integration/inputs/hello.txt
+---
+"Contents of hello"
diff --git a/...s/test_inline__unnamed_single_line-2.snap → ...ation__inline__unnamed_single_line-2.snap b/...s/test_inline__unnamed_single_line-2.snap → ...ation__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