From d9d14b38dea58a5ef520376e08fa25f2ec3bd04b Mon Sep 17 00:00:00 2001
From: Kangaxx-0 <85712372+Kangaxx-0@users.noreply.github.com>
Date: Thu, 22 Sep 2022 11:50:16 -0700
Subject: [PATCH] [Cleanup]Nu completion unit tests (#6601)

* clean up completion unit tests

* update
---
 crates/nu-cli/tests/completions.rs | 40 ++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/crates/nu-cli/tests/completions.rs b/crates/nu-cli/tests/completions.rs
index 10c88c17b6..ab85eb51fd 100644
--- a/crates/nu-cli/tests/completions.rs
+++ b/crates/nu-cli/tests/completions.rs
@@ -34,8 +34,20 @@ fn completer_strings() -> NuCompleter {
     NuCompleter::new(std::sync::Arc::new(engine), stack)
 }
 
+#[test]
+fn variables_dollar_sign_with_varialblecompletion() {
+    let (_, _, engine, stack) = new_engine();
+
+    let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+
+    let target_dir = "$ ";
+    let suggestions = completer.complete(target_dir, target_dir.len());
+
+    assert_eq!(7, suggestions.len());
+}
+
 #[rstest]
-fn variables_completions_double_dash_argument(mut completer: NuCompleter) {
+fn variables_double_dash_argument_with_flagcompletion(mut completer: NuCompleter) {
     let suggestions = completer.complete("tst --", 6);
     let expected: Vec<String> = vec!["--help".into(), "--mod".into()];
     // dbg!(&expected, &suggestions);
@@ -43,28 +55,30 @@ fn variables_completions_double_dash_argument(mut completer: NuCompleter) {
 }
 
 #[rstest]
-fn variables_completions_single_dash_argument(mut completer: NuCompleter) {
+fn variables_single_dash_argument_with_flagcompletion(mut completer: NuCompleter) {
     let suggestions = completer.complete("tst -", 5);
     let expected: Vec<String> = vec!["--help".into(), "--mod".into(), "-h".into(), "-s".into()];
     match_suggestions(expected, suggestions);
 }
 
 #[rstest]
-fn variables_completions_command(mut completer_strings: NuCompleter) {
+fn variables_command_with_commandcompletion(mut completer_strings: NuCompleter) {
     let suggestions = completer_strings.complete("my-command ", 9);
     let expected: Vec<String> = vec!["my-command".into()];
     match_suggestions(expected, suggestions);
 }
 
 #[rstest]
-fn variables_completions_subcommands(mut completer_strings: NuCompleter) {
+fn variables_subcommands_with_customcompletion(mut completer_strings: NuCompleter) {
     let suggestions = completer_strings.complete("my-command ", 11);
     let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
     match_suggestions(expected, suggestions);
 }
 
 #[rstest]
-fn variables_completions_subcommands_2(mut completer_strings: NuCompleter) {
+fn variables_customcompletion_subcommands_with_customcompletion_2(
+    mut completer_strings: NuCompleter,
+) {
     let suggestions = completer_strings.complete("my-command ", 11);
     let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
     match_suggestions(expected, suggestions);
@@ -168,7 +182,7 @@ fn file_completions() {
 }
 
 #[test]
-fn command_ls_completion() {
+fn command_ls_with_filecompletion() {
     let (_, _, engine, stack) = new_engine();
 
     let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
@@ -200,7 +214,7 @@ fn command_ls_completion() {
     match_suggestions(expected_paths, suggestions)
 }
 #[test]
-fn command_open_completion() {
+fn command_open_with_filecompletion() {
     let (_, _, engine, stack) = new_engine();
 
     let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
@@ -233,7 +247,7 @@ fn command_open_completion() {
 }
 
 #[test]
-fn command_rm_completion() {
+fn command_rm_with_globcompletion() {
     let (_, _, engine, stack) = new_engine();
 
     let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
@@ -266,7 +280,7 @@ fn command_rm_completion() {
 }
 
 #[test]
-fn command_cp_completion() {
+fn command_cp_with_globcompletion() {
     let (_, _, engine, stack) = new_engine();
 
     let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
@@ -299,7 +313,7 @@ fn command_cp_completion() {
 }
 
 #[test]
-fn command_save_completion() {
+fn command_save_with_filecompletion() {
     let (_, _, engine, stack) = new_engine();
 
     let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
@@ -332,7 +346,7 @@ fn command_save_completion() {
 }
 
 #[test]
-fn command_touch_completion() {
+fn command_touch_with_filecompletion() {
     let (_, _, engine, stack) = new_engine();
 
     let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
@@ -365,7 +379,7 @@ fn command_touch_completion() {
 }
 
 #[test]
-fn command_watch_completion() {
+fn command_watch_with_filecompletion() {
     let (_, _, engine, stack) = new_engine();
 
     let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
@@ -431,7 +445,7 @@ fn flag_completions() {
 }
 
 #[test]
-fn folder_completions() {
+fn folder_with_directorycompletions() {
     // Create a new engine
     let (dir, dir_str, engine, stack) = new_engine();