Remove old nushell/merge engine-q

crates/nu-command/tests/commands/path/basename.rs

@@ -0,0 +1,83 @@
+use nu_test_support::{nu, pipeline};
+
+use super::join_path_sep;
+
+#[test]
+fn returns_basename_of_empty_input() {
+    let actual = nu!(
+        cwd: "tests", pipeline(
+        r#"
+            echo "" 
+            | path basename
+        "#
+    ));
+
+    assert_eq!(actual.out, "");
+}
+
+#[test]
+fn replaces_basename_of_empty_input() {
+    let actual = nu!(
+        cwd: "tests", pipeline(
+        r#"
+            echo "" 
+            | path basename -r newname.txt
+        "#
+    ));
+
+    assert_eq!(actual.out, "newname.txt");
+}
+
+#[test]
+fn returns_basename_of_path_ending_with_dot() {
+    let actual = nu!(
+        cwd: "tests", pipeline(
+        r#"
+            echo "some/file.txt/." 
+            | path basename 
+        "#
+    ));
+
+    assert_eq!(actual.out, "file.txt");
+}
+
+#[test]
+fn replaces_basename_of_path_ending_with_dot() {
+    let actual = nu!(
+        cwd: "tests", pipeline(
+        r#"
+            echo "some/file.txt/." 
+            | path basename -r viking.txt
+        "#
+    ));
+
+    let expected = join_path_sep(&["some", "viking.txt"]);
+    assert_eq!(actual.out, expected);
+}
+
+#[test]
+fn returns_basename_of_path_ending_with_double_dot() {
+    let actual = nu!(
+        cwd: "tests", pipeline(
+        r#"
+            echo "some/file.txt/.." 
+            | path basename 
+        "#
+    ));
+
+    assert_eq!(actual.out, "");
+}
+
+#[test]
+fn replaces_basename_of_path_ending_with_double_dot() {
+    let actual = nu!(
+        cwd: "tests", pipeline(
+        r#"
+            echo "some/file.txt/.." 
+            | path basename -r eggs
+        "#
+    ));
+
+    let expected = join_path_sep(&["some/file.txt/..", "eggs"]);
+    assert_eq!(actual.out, expected);
+}

crates/nu-command/tests/commands/path/dirname.rs

@@ -0,0 +1,137 @@
+use nu_test_support::{nu, pipeline};
+
+use super::join_path_sep;
+
+#[test]
+fn returns_dirname_of_empty_input() {
+    let actual = nu!(
+        cwd: "tests", pipeline(
+        r#"
+            echo "" 
+            | path dirname
+        "#
+    ));
+
+    assert_eq!(actual.out, "");
+}
+
+#[test]
+fn replaces_dirname_of_empty_input() {
+    let actual = nu!(
+        cwd: "tests", pipeline(
+        r#"
+            echo "" 
+            | path dirname -r newdir
+        "#
+    ));
+
+    assert_eq!(actual.out, "newdir");
+}
+
+#[test]
+fn returns_dirname_of_path_ending_with_dot() {
+    let actual = nu!(
+        cwd: "tests", pipeline(
+        r#"
+            echo "some/dir/." 
+            | path dirname 
+        "#
+    ));
+
+    assert_eq!(actual.out, "some");
+}
+
+#[test]
+fn replaces_dirname_of_path_ending_with_dot() {
+    let actual = nu!(
+        cwd: "tests", pipeline(
+        r#"
+            echo "some/dir/." 
+            | path dirname -r eggs
+        "#
+    ));
+
+    let expected = join_path_sep(&["eggs", "dir"]);
+    assert_eq!(actual.out, expected);
+}
+
+#[test]
+fn returns_dirname_of_path_ending_with_double_dot() {
+    let actual = nu!(
+        cwd: "tests", pipeline(
+        r#"
+            echo "some/dir/.." 
+            | path dirname 
+        "#
+    ));
+
+    assert_eq!(actual.out, "some/dir");
+}
+
+#[test]
+fn replaces_dirname_of_path_with_double_dot() {
+    let actual = nu!(
+        cwd: "tests", pipeline(
+        r#"
+            echo "some/dir/.." 
+            | path dirname -r eggs
+        "#
+    ));
+
+    let expected = join_path_sep(&["eggs", ".."]);
+    assert_eq!(actual.out, expected);
+}
+
+#[test]
+fn returns_dirname_of_zero_levels() {
+    let actual = nu!(
+        cwd: "tests", pipeline(
+        r#"
+            echo "some/dir/with/spam.txt"
+            | path dirname -n 0
+        "#
+    ));
+
+    assert_eq!(actual.out, "some/dir/with/spam.txt");
+}
+
+#[test]
+fn replaces_dirname_of_zero_levels_with_empty_string() {
+    let actual = nu!(
+        cwd: "tests", pipeline(
+        r#"
+            echo "some/dir/with/spam.txt"
+            | path dirname -n 0 -r ""
+        "#
+    ));
+
+    assert_eq!(actual.out, "");
+}
+
+#[test]
+fn replaces_dirname_of_more_levels() {
+    let actual = nu!(
+        cwd: "tests", pipeline(
+        r#"
+            echo "some/dir/with/spam.txt"
+            | path dirname -r eggs -n 2
+        "#
+    ));
+
+    let expected = join_path_sep(&["eggs", "with/spam.txt"]);
+    assert_eq!(actual.out, expected);
+}
+
+#[test]
+fn replaces_dirname_of_way_too_many_levels() {
+    let actual = nu!(
+        cwd: "tests", pipeline(
+        r#"
+            echo "some/dir/with/spam.txt"
+            | path dirname -r eggs -n 999
+        "#
+    ));
+
+    let expected = join_path_sep(&["eggs", "some/dir/with/spam.txt"]);
+    assert_eq!(actual.out, expected);
+}

crates/nu-command/tests/commands/path/exists.rs

@@ -2,11 +2,8 @@ use nu_test_support::fs::Stub::EmptyFile;
 use nu_test_support::nu;
 use nu_test_support::playground::Playground;
 
-<<<<<<< HEAD
-=======
 // FIXME: jt: needs more work
 #[ignore]
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
 #[test]
 fn checks_if_existing_file_exists() {
     Playground::setup("path_exists_1", |dirs, sandbox| {

crates/nu-command/tests/commands/path/expand.rs

@@ -0,0 +1,78 @@
+use nu_test_support::fs::Stub::EmptyFile;
+use nu_test_support::playground::Playground;
+use nu_test_support::{nu, pipeline};
+
+use std::path::PathBuf;
+
+#[test]
+fn expands_path_with_dot() {
+    Playground::setup("path_expand_1", |dirs, sandbox| {
+        sandbox
+            .within("menu")
+            .with_files(vec![EmptyFile("spam.txt")]);
+
+        let actual = nu!(
+            cwd: dirs.test(), pipeline(
+            r#"
+                echo "menu/./spam.txt" 
+                | path expand
+            "#
+        ));
+
+        let expected = dirs.test.join("menu").join("spam.txt");
+        assert_eq!(PathBuf::from(actual.out), expected);
+    })
+}
+
+#[test]
+fn expands_path_with_double_dot() {
+    Playground::setup("path_expand_2", |dirs, sandbox| {
+        sandbox
+            .within("menu")
+            .with_files(vec![EmptyFile("spam.txt")]);
+
+        let actual = nu!(
+            cwd: dirs.test(), pipeline(
+            r#"
+                echo "menu/../menu/spam.txt" 
+                | path expand
+            "#
+        ));
+
+        let expected = dirs.test.join("menu").join("spam.txt");
+        assert_eq!(PathBuf::from(actual.out), expected);
+    })
+}
+
+#[cfg(windows)]
+mod windows {
+    use super::*;
+
+    #[test]
+    fn expands_path_with_tilde_backward_slash() {
+        Playground::setup("path_expand_2", |dirs, _| {
+            let actual = nu!(
+                cwd: dirs.test(), pipeline(
+                r#"
+                    echo "~\tmp.txt" | path expand
+                "#
+            ));
+
+            assert!(!PathBuf::from(actual.out).starts_with("~"));
+        })
+    }
+
+    #[test]
+    fn win_expands_path_with_tilde_forward_slash() {
+        Playground::setup("path_expand_2", |dirs, _| {
+            let actual = nu!(
+                cwd: dirs.test(), pipeline(
+                r#"
+                    echo "~/tmp.txt" | path expand
+                "#
+            ));
+
+            assert!(!PathBuf::from(actual.out).starts_with("~"));
+        })
+    }
+}

crates/nu-command/tests/commands/path/join.rs

@@ -0,0 +1,59 @@
+use nu_test_support::{nu, pipeline};
+
+use super::join_path_sep;
+
+#[test]
+fn returns_path_joined_with_column_path() {
+    let actual = nu!(
+        cwd: "tests", pipeline(
+        r#"
+            echo [ [name]; [eggs] ]
+            | path join spam.txt -c [ name ]
+            | get name
+        "#
+    ));
+
+    let expected = join_path_sep(&["eggs", "spam.txt"]);
+    assert_eq!(actual.out, expected);
+}
+
+#[test]
+fn returns_path_joined_from_list() {
+    let actual = nu!(
+        cwd: "tests", pipeline(
+        r#"
+            echo [ home viking spam.txt ]
+            | path join
+        "#
+    ));
+
+    let expected = join_path_sep(&["home", "viking", "spam.txt"]);
+    assert_eq!(actual.out, expected);
+}
+
+#[test]
+fn appends_slash_when_joined_with_empty_path() {
+    let actual = nu!(
+        cwd: "tests", pipeline(
+        r#"
+            echo "/some/dir"
+            | path join ''
+        "#
+    ));
+
+    let expected = join_path_sep(&["/some/dir", ""]);
+    assert_eq!(actual.out, expected);
+}
+
+#[test]
+fn returns_joined_path_when_joining_empty_path() {
+    let actual = nu!(
+        cwd: "tests", pipeline(
+        r#"
+            echo ""
+            | path join foo.txt
+        "#
+    ));
+
+    assert_eq!(actual.out, "foo.txt");
+}

crates/nu-command/tests/commands/path/mod.rs

@@ -0,0 +1,34 @@
+mod basename;
+mod dirname;
+mod exists;
+mod expand;
+mod join;
+mod parse;
+mod split;
+mod type_;
+
+use std::path::MAIN_SEPARATOR;
+
+/// Helper function that joins string literals with '/' or '\', based on host OS
+fn join_path_sep(pieces: &[&str]) -> String {
+    let sep_string = String::from(MAIN_SEPARATOR);
+    pieces.join(&sep_string)
+}
+
+#[cfg(windows)]
+#[test]
+fn joins_path_on_windows() {
+    let pieces = ["sausage", "bacon", "spam"];
+    let actual = join_path_sep(&pieces);
+
+    assert_eq!(&actual, "sausage\\bacon\\spam");
+}
+
+#[cfg(not(windows))]
+#[test]
+fn joins_path_on_other_than_windows() {
+    let pieces = ["sausage", "bacon", "spam"];
+    let actual = join_path_sep(&pieces);
+
+    assert_eq!(&actual, "sausage/bacon/spam");
+}

crates/nu-command/tests/commands/path/parse.rs

@@ -114,11 +114,8 @@ fn parses_column_path_extension() {
     assert_eq!(actual.out, "png");
 }
 
-<<<<<<< HEAD
-=======
 // FIXME: jt: needs more work
 #[ignore]
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
 #[test]
 fn parses_into_correct_number_of_columns() {
     let actual = nu!(

crates/nu-command/tests/commands/path/split.rs

@@ -17,11 +17,7 @@ fn splits_correctly_single_path() {
     let actual = nu!(
         cwd: "tests", pipeline(
         r#"
-<<<<<<< HEAD
-            echo ['home/viking/spam.txt']
-=======
             'home/viking/spam.txt'
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
             | path split
             | last
         "#
@@ -43,10 +39,7 @@ fn splits_correctly_with_column_path() {
             ]
             | path split -c [ home barn ]
             | get barn
-<<<<<<< HEAD
-=======
             | flatten
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
             | length
         "#
     ));

crates/nu-command/tests/commands/path/type_.rs

@@ -15,11 +15,8 @@ fn returns_type_of_missing_file() {
     assert_eq!(actual.out, "");
 }
 
-<<<<<<< HEAD
-=======
 // FIXME: jt: needs more work
 #[ignore]
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
 #[test]
 fn returns_type_of_existing_file() {
     Playground::setup("path_expand_1", |dirs, sandbox| {
@@ -35,19 +32,12 @@ fn returns_type_of_existing_file() {
             "#
         ));
 
-<<<<<<< HEAD
-        assert_eq!(actual.out, "Dir");
-    })
-}
-
-=======
         assert_eq!(actual.out, "dir");
     })
 }
 
 // FIXME: jt: needs more work
 #[ignore]
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
 #[test]
 fn returns_type_of_existing_directory() {
     Playground::setup("path_expand_1", |dirs, sandbox| {
@@ -63,10 +53,6 @@ fn returns_type_of_existing_directory() {
             "#
         ));
 
-<<<<<<< HEAD
-        assert_eq!(actual.out, "File");
-=======
         assert_eq!(actual.out, "file");
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
     })
 }