holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove old nushell/merge engine-q

Browse Source
This commit is contained in:
JT
2022-02-07 14:54:06 -05:00
parent 10c4c50f1f
commit d70d91e559
430 changed files with 14543 additions and 7865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
crates/nu-command/tests/commands/sort_by.rs
View File

@ -1,10 +1,7 @@
use nu_test_support::{nu, pipeline};
<<<<<<< HEAD
=======
// FIXME: jt: needs more work
#[ignore]
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
#[test]
fn by_column() {
let actual = nu!(
@ -26,11 +23,8 @@ fn by_column() {
assert_eq!(actual.out, "description");
}
<<<<<<< HEAD
=======
// FIXME: jt: needs more work
#[ignore]
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
#[test]
fn by_invalid_column() {
let actual = nu!(
@ -53,11 +47,8 @@ fn by_invalid_column() {
assert!(actual.err.contains("invalid column"));
}
<<<<<<< HEAD
=======
// FIXME: jt: needs more work
#[ignore]
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
#[test]
fn by_invalid_types() {
let actual = nu!(
@ -100,20 +91,12 @@ fn ls_sort_by_name_sensitive() {
open sample-ls-output.json
| sort-by name
| select name
<<<<<<< HEAD
| to json
"#
));
let json_output = r#"[{"name":"B.txt"},{"name":"C"},{"name":"a.txt"}]"#;
=======
| to json --raw
"#
));
//let json_output = r#"[{"name":"B.txt"},{"name":"C"},{"name":"a.txt"}]"#;
let json_output = r#"[{"name": "B.txt"},{"name": "C"},{"name": "a.txt"}]"#;
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
assert_eq!(actual.out, json_output);
}
@ -126,20 +109,11 @@ fn ls_sort_by_name_insensitive() {
open sample-ls-output.json
| sort-by -i name
| select name
<<<<<<< HEAD
| to json
"#
));
let json_output = r#"[{"name":"a.txt"},{"name":"B.txt"},{"name":"C"}]"#;
=======
| to json --raw
"#
));
let json_output = r#"[{"name": "B.txt"},{"name": "C"},{"name": "a.txt"}]"#;
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
assert_eq!(actual.out, json_output);
}
@ -151,20 +125,11 @@ fn ls_sort_by_type_name_sensitive() {
open sample-ls-output.json
| sort-by type name
| select name type
<<<<<<< HEAD
| to json
"#
));
let json_output = r#"[{"name":"C","type":"Dir"},{"name":"B.txt","type":"File"},{"name":"a.txt","type":"File"}]"#;
=======
| to json --raw
"#
));
let json_output = r#"[{"name": "C","type": "Dir"},{"name": "a.txt","type": "File"},{"name": "B.txt","type": "File"}]"#;
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
assert_eq!(actual.out, json_output);
}
@ -176,19 +141,10 @@ fn ls_sort_by_type_name_insensitive() {
open sample-ls-output.json
| sort-by -i type name
| select name type
<<<<<<< HEAD
| to json
"#
));
let json_output = r#"[{"name":"C","type":"Dir"},{"name":"a.txt","type":"File"},{"name":"B.txt","type":"File"}]"#;
=======
| to json --raw
"#
));
let json_output = r#"[{"name": "C","type": "Dir"},{"name": "a.txt","type": "File"},{"name": "B.txt","type": "File"}]"#;
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
assert_eq!(actual.out, json_output);
}