Pick->Select rename. Integration tests changes. (#1725)

Pick->Select rename. Integration tests changes.

tests/plugins/core_inc.rs

@@ -1,15 +1,17 @@
 use nu_test_support::fs::Stub::FileWithContent;
+use nu_test_support::nu;
 use nu_test_support::playground::Playground;
-use nu_test_support::{nu, nu_error};
 
 #[test]
 fn can_only_apply_one() {
-    let actual = nu_error!(
+    let actual = nu!(
         cwd: "tests/fixtures/formats",
         "open cargo_sample.toml | first 1 | inc package.version --major --minor"
     );
 
-    assert!(actual.contains("Usage: inc field [--major|--minor|--patch]"));
+    assert!(actual
+        .err
+        .contains("Usage: inc field [--major|--minor|--patch]"));
 }
 
 #[test]
@@ -28,7 +30,7 @@ fn by_one_with_field_passed() {
             "open sample.toml | inc package.edition | get package.edition | echo $it"
         );
 
-        assert_eq!(actual, "2019");
+        assert_eq!(actual.out, "2019");
     })
 }
 
@@ -48,7 +50,7 @@ fn by_one_with_no_field_passed() {
             "open sample.toml | get package.contributors | inc | echo $it"
         );
 
-        assert_eq!(actual, "3");
+        assert_eq!(actual.out, "3");
     })
 }
 
@@ -68,7 +70,7 @@ fn semversion_major_inc() {
             "open sample.toml | inc package.version -M | get package.version | echo $it"
         );
 
-        assert_eq!(actual, "1.0.0");
+        assert_eq!(actual.out, "1.0.0");
     })
 }
 
@@ -88,7 +90,7 @@ fn semversion_minor_inc() {
             "open sample.toml | inc package.version --minor | get package.version | echo $it"
         );
 
-        assert_eq!(actual, "0.2.0");
+        assert_eq!(actual.out, "0.2.0");
     })
 }
 
@@ -108,7 +110,7 @@ fn semversion_patch_inc() {
             "open sample.toml | inc package.version --patch | get package.version | echo $it"
         );
 
-        assert_eq!(actual, "0.1.4");
+        assert_eq!(actual.out, "0.1.4");
     })
 }
 
@@ -128,6 +130,6 @@ fn semversion_without_passing_field() {
             "open sample.toml | get package.version | inc --patch | echo $it"
         );
 
-        assert_eq!(actual, "0.1.4");
+        assert_eq!(actual.out, "0.1.4");
     })
 }

tests/plugins/core_str.rs

@@ -1,15 +1,15 @@
 use nu_test_support::fs::Stub::FileWithContent;
 use nu_test_support::playground::Playground;
-use nu_test_support::{nu, nu_error, pipeline};
+use nu_test_support::{nu, pipeline};
 
 #[test]
 fn can_only_apply_one() {
-    let actual = nu_error!(
+    let actual = nu!(
         cwd: "tests/fixtures/formats",
         "open caco3_plastics.csv | first 1 | str origin --downcase --upcase"
     );
 
-    assert!(actual.contains(r#"--capitalize|--downcase|--upcase|--to-int|--substring "start,end"|--replace|--find-replace [pattern replacement]|to-date-time|--trim]"#));
+    assert!(actual.err.contains(r#"--capitalize|--downcase|--upcase|--to-int|--substring "start,end"|--replace|--find-replace [pattern replacement]|to-date-time|--trim]"#));
 }
 
 #[test]
@@ -29,7 +29,7 @@ fn acts_without_passing_field() {
             "open sample.yml | get environment.global.PROJECT_NAME | str --upcase | echo $it"
         );
 
-        assert_eq!(actual, "NUSHELL");
+        assert_eq!(actual.out, "NUSHELL");
     })
 }
 
@@ -49,7 +49,7 @@ fn trims() {
             "open sample.toml | str dependency.name --trim | get dependency.name | echo $it"
         );
 
-        assert_eq!(actual, "nu");
+        assert_eq!(actual.out, "nu");
     })
 }
 
@@ -69,7 +69,7 @@ fn capitalizes() {
             "open sample.toml | str dependency.name --capitalize | get dependency.name | echo $it"
         );
 
-        assert_eq!(actual, "Nu");
+        assert_eq!(actual.out, "Nu");
     })
 }
 
@@ -89,7 +89,7 @@ fn downcases() {
             "open sample.toml | str dependency.name -d | get dependency.name | echo $it"
         );
 
-        assert_eq!(actual, "light");
+        assert_eq!(actual.out, "light");
     })
 }
 
@@ -109,7 +109,7 @@ fn upcases() {
             "open sample.toml | str package.name --upcase | get package.name | echo $it"
         );
 
-        assert_eq!(actual, "NUSHELL");
+        assert_eq!(actual.out, "NUSHELL");
     })
 }
 
@@ -128,7 +128,7 @@ fn converts_to_int() {
         "#
     ));
 
-    assert_eq!(actual, "1");
+    assert_eq!(actual.out, "1");
 }
 
 #[test]
@@ -152,7 +152,7 @@ fn replaces() {
              "#
         ));
 
-        assert_eq!(actual, "wykittenshell");
+        assert_eq!(actual.out, "wykittenshell");
     })
 }
 
@@ -177,7 +177,7 @@ fn find_and_replaces() {
              "#
         ));
 
-        assert_eq!(actual, "1-800-5289");
+        assert_eq!(actual.out, "1-800-5289");
     })
 }
 
@@ -202,6 +202,6 @@ fn find_and_replaces_without_passing_field() {
              "#
         ));
 
-        assert_eq!(actual, "1-800-5289");
+        assert_eq!(actual.out, "1-800-5289");
     })
 }