engine-q merge

This commit is contained in:
Fernando Herrera
2022-02-07 19:11:34 +00:00
1965 changed files with 119062 additions and 20 deletions

View File

@ -33,7 +33,11 @@ fn into_filesize_str() {
"#
));
<<<<<<< HEAD
assert!(actual.out.contains("2.0 KB"));
=======
assert!(actual.out.contains("2.0 KiB"));
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
}
#[test]
@ -41,12 +45,21 @@ fn into_filesize_str_newline() {
let actual = nu!(
cwd: ".", pipeline(
r#"
<<<<<<< HEAD
'2000
' | into filesize
"#
));
assert!(actual.out.contains("2.0 KB"));
=======
"2000
" | into filesize
"#
));
assert!(actual.out.contains("2.0 KiB"));
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
}
#[test]
@ -54,6 +67,7 @@ fn into_filesize_str_many_newlines() {
let actual = nu!(
cwd: ".", pipeline(
r#"
<<<<<<< HEAD
'2000
' | into filesize
@ -61,6 +75,15 @@ fn into_filesize_str_many_newlines() {
));
assert!(actual.out.contains("2.0 KB"));
=======
"2000
" | into filesize
"#
));
assert!(actual.out.contains("2.0 KiB"));
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
}
#[test]
@ -68,9 +91,17 @@ fn into_filesize_filesize() {
let actual = nu!(
cwd: ".", pipeline(
r#"
<<<<<<< HEAD
3kb | into filesize
"#
));
assert!(actual.out.contains("3.0 KB"));
=======
3kib | into filesize
"#
));
assert!(actual.out.contains("3.0 KiB"));
>>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
}