test(complete): Specialize tests

clap-rs · Aug 12, 2024 · 6288e11 · 6288e11
1 parent 70d8334
commit 6288e11
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 18 deletions.
diff --git a/...hots/home/dynamic/exhaustive/bash/.bashrc → ...e/dynamic-command/exhaustive/bash/.bashrc b/...hots/home/dynamic/exhaustive/bash/.bashrc → ...e/dynamic-command/exhaustive/bash/.bashrc
diff --git a/...e/dynamic/exhaustive/elvish/elvish/rc.elv → ...c-command/exhaustive/elvish/elvish/rc.elv b/...e/dynamic/exhaustive/elvish/elvish/rc.elv → ...c-command/exhaustive/elvish/elvish/rc.elv
diff --git a/...ive/fish/fish/completions/exhaustive.fish → ...ive/fish/fish/completions/exhaustive.fish b/...ive/fish/fish/completions/exhaustive.fish → ...ive/fish/fish/completions/exhaustive.fish
diff --git a/.../dynamic/exhaustive/fish/fish/config.fish → ...-command/exhaustive/fish/fish/config.fish b/.../dynamic/exhaustive/fish/fish/config.fish → ...-command/exhaustive/fish/fish/config.fish
diff --git a/...shots/home/dynamic/exhaustive/zsh/.zshenv → ...me/dynamic-command/exhaustive/zsh/.zshenv b/...shots/home/dynamic/exhaustive/zsh/.zshenv → ...me/dynamic-command/exhaustive/zsh/.zshenv
diff --git a/...me/dynamic/exhaustive/zsh/zsh/_exhaustive → ...ic-command/exhaustive/zsh/zsh/_exhaustive b/...me/dynamic/exhaustive/zsh/zsh/_exhaustive → ...ic-command/exhaustive/zsh/zsh/_exhaustive
diff --git a/clap_complete/tests/testsuite/bash.rs b/clap_complete/tests/testsuite/bash.rs
@@ -250,20 +250,20 @@ fn complete() {
 
 #[test]
 #[cfg(all(unix, feature = "unstable-command"))]
-fn register_dynamic_completion() {
-    common::register_example::<completest_pty::BashRuntimeBuilder>("dynamic", "exhaustive");
+fn register_dynamic_command() {
+    common::register_example::<completest_pty::BashRuntimeBuilder>("dynamic-command", "exhaustive");
 }
 
 #[test]
 #[cfg(all(unix, feature = "unstable-command"))]
-fn complete_dynamic() {
+fn complete_dynamic_command() {
     if !common::has_command("bash") {
         return;
     }
 
     let term = completest::Term::new();
     let mut runtime =
-        common::load_runtime::<completest_pty::BashRuntimeBuilder>("dynamic", "exhaustive");
+        common::load_runtime::<completest_pty::BashRuntimeBuilder>("dynamic-command", "exhaustive");
 
     let input = "exhaustive \t\t";
     let expected = snapbox::str![[r#"

diff --git a/clap_complete/tests/testsuite/common.rs b/clap_complete/tests/testsuite/common.rs
@@ -331,7 +331,7 @@ pub(crate) fn register_example<R: completest::RuntimeBuilder>(context: &str, nam
     let mut registration = std::process::Command::new(&bin_path);
     match context {
         "static" => registration.args([format!("--generate={shell_name}")]),
-        "dynamic" => registration.args(["complete", shell_name]),
+        "dynamic-command" => registration.args(["complete", shell_name]),
         _ => unreachable!("unsupported context {}", context),
     };
     let registration = registration.output().unwrap();

diff --git a/clap_complete/tests/testsuite/elvish.rs b/clap_complete/tests/testsuite/elvish.rs
@@ -177,20 +177,25 @@ value          value
 
 #[test]
 #[cfg(all(unix, feature = "unstable-command"))]
-fn register_dynamic() {
-    common::register_example::<completest_pty::ElvishRuntimeBuilder>("dynamic", "exhaustive");
+fn register_dynamic_command() {
+    common::register_example::<completest_pty::ElvishRuntimeBuilder>(
+        "dynamic-command",
+        "exhaustive",
+    );
 }
 
 #[test]
 #[cfg(all(unix, feature = "unstable-command"))]
-fn complete_dynamic() {
+fn complete_dynamic_command() {
     if !common::has_command("elvish") {
         return;
     }
 
     let term = completest::Term::new();
-    let mut runtime =
-        common::load_runtime::<completest_pty::ElvishRuntimeBuilder>("dynamic", "exhaustive");
+    let mut runtime = common::load_runtime::<completest_pty::ElvishRuntimeBuilder>(
+        "dynamic-command",
+        "exhaustive",
+    );
 
     let input = "exhaustive \t";
     let expected = snapbox::str![[r#"

diff --git a/clap_complete/tests/testsuite/fish.rs b/clap_complete/tests/testsuite/fish.rs
@@ -167,20 +167,20 @@ bash  (bash (shell))  fish  (fish shell)  zsh  (zsh shell)"#;
 
 #[test]
 #[cfg(all(unix, feature = "unstable-command"))]
-fn register_dynamic() {
-    common::register_example::<completest_pty::FishRuntimeBuilder>("dynamic", "exhaustive");
+fn register_dynamic_command() {
+    common::register_example::<completest_pty::FishRuntimeBuilder>("dynamic-command", "exhaustive");
 }
 
 #[test]
 #[cfg(all(unix, feature = "unstable-command"))]
-fn complete_dynamic() {
+fn complete_dynamic_command() {
     if !common::has_command("fish") {
         return;
     }
 
     let term = completest::Term::new();
     let mut runtime =
-        common::load_runtime::<completest_pty::FishRuntimeBuilder>("dynamic", "exhaustive");
+        common::load_runtime::<completest_pty::FishRuntimeBuilder>("dynamic-command", "exhaustive");
 
     let input = "exhaustive \t\t";
     let expected = snapbox::str![[r#"

diff --git a/clap_complete/tests/testsuite/zsh.rs b/clap_complete/tests/testsuite/zsh.rs
@@ -165,20 +165,20 @@ pacman    action  alias  value  quote  hint  last  --
 
 #[test]
 #[cfg(all(unix, feature = "unstable-command"))]
-fn register_dynamic() {
-    common::register_example::<completest_pty::ZshRuntimeBuilder>("dynamic", "exhaustive");
+fn register_dynamic_command() {
+    common::register_example::<completest_pty::ZshRuntimeBuilder>("dynamic-command", "exhaustive");
 }
 
 #[test]
 #[cfg(all(unix, feature = "unstable-command"))]
-fn complete_dynamic() {
+fn complete_dynamic_command() {
     if !common::has_command("zsh") {
         return;
     }
 
     let term = completest::Term::new();
     let mut runtime =
-        common::load_runtime::<completest_pty::ZshRuntimeBuilder>("dynamic", "exhaustive");
+        common::load_runtime::<completest_pty::ZshRuntimeBuilder>("dynamic-command", "exhaustive");
 
     let input = "exhaustive \t\t";
     let expected = snapbox::str![[r#"