Add a .fix_everything() test helper

Author: killercup

cargo-fix/tests/all/broken_build.rs

@@ -37,7 +37,7 @@ fn fix_broken_if_requested() {
         .build();
 
     p.expect_cmd("cargo-fix fix --broken-code")
-        .env("__CARGO_FIX_YOLO", "true")
+        .fix_everything()
         .status(0)
         .run();
 }
@@ -114,7 +114,7 @@ fn broken_fixes_backed_out() {
 
     // Attempt to fix code, but our shim will always fail the second compile
     p.expect_cmd("cargo-fix fix")
-        .env("__CARGO_FIX_YOLO", "true")
+        .fix_everything()
         .cwd("bar")
         .env("RUSTC", p.root.join("foo/target/debug/foo"))
         .stderr_contains("not rust code")

cargo-fix/tests/all/broken_lints.rs

@@ -19,7 +19,7 @@
 //         .build();
 
 //     p.expect_cmd("cargo-fix fix")
-//         .env("__CARGO_FIX_YOLO", "true")
+//         .fix_everything()
 //         .stderr_contains(r"warning: error applying suggestions to `src/lib.rs`")
 //         .stderr_contains("The full error message was:")
 //         .stderr_contains("> Could not replace range 56...60 in file -- maybe parts of it were already replaced?")

cargo-fix/tests/all/dependencies.rs

@@ -54,7 +54,7 @@ fn fix_path_deps() {
 [FINISHED] dev [unoptimized + debuginfo]
 ";
     p.expect_cmd("cargo-fix fix")
-        .env("__CARGO_FIX_YOLO", "true")
+        .fix_everything()
         .stdout("")
         .stderr(stderr)
         .run();

cargo-fix/tests/all/edition_upgrade.rs

@@ -161,7 +161,7 @@ fn upgrade_extern_crate() {
 [FINISHED] dev [unoptimized + debuginfo]
 ";
     p.expect_cmd("cargo-fix fix")
-        .env("__CARGO_FIX_YOLO", "true")
+        .fix_everything()
         .stdout("")
         .stderr(stderr)
         .run();

cargo-fix/tests/all/main.rs

@@ -151,6 +151,11 @@ impl<'a> ExpectCmd<'a> {
         self
     }
 
+    fn fix_everything(&mut self) -> &mut Self {
+        self.env("__CARGO_FIX_YOLO", "true");
+        self
+    }
+
     fn stdout(&mut self, s: &str) -> &mut Self {
         self.stdout = Some(s.to_string());
         self

cargo-fix/tests/all/smoke.rs

@@ -34,7 +34,7 @@ fn fixes_extra_mut() {
 [FINISHED] dev [unoptimized + debuginfo]
 ";
     p.expect_cmd("cargo-fix fix")
-        .env("__CARGO_FIX_YOLO", "true")
+        .fix_everything()
         .stdout("")
         .stderr(stderr)
         .run();
@@ -61,7 +61,7 @@ fn fixes_two_missing_ampersands() {
 [FINISHED] dev [unoptimized + debuginfo]
 ";
     p.expect_cmd("cargo-fix fix")
-        .env("__CARGO_FIX_YOLO", "true")
+        .fix_everything()
         .stdout("")
         .stderr(stderr)
         .run();
@@ -87,7 +87,7 @@ fn tricky() {
 [FINISHED] dev [unoptimized + debuginfo]
 ";
     p.expect_cmd("cargo-fix fix")
-        .env("__CARGO_FIX_YOLO", "true")
+        .fix_everything()
         .stdout("")
         .stderr(stderr)
         .run();
@@ -106,7 +106,7 @@ fn preserve_line_endings() {
         .build();
 
     p.expect_cmd("cargo-fix fix")
-        .env("__CARGO_FIX_YOLO", "true")
+        .fix_everything()
         .run();
     assert!(p.read("src/lib.rs").contains("\r\n"));
 }
@@ -124,7 +124,7 @@ fn fix_deny_warnings() {
         .build();
 
     p.expect_cmd("cargo-fix fix")
-        .env("__CARGO_FIX_YOLO", "true")
+        .fix_everything()
         .run();
 }
 
@@ -147,7 +147,7 @@ fn fix_deny_warnings_but_not_others() {
         .build();
 
     p.expect_cmd("cargo-fix fix")
-        .env("__CARGO_FIX_YOLO", "true")
+        .fix_everything()
         .run();
     assert!(!p.read("src/lib.rs").contains("let mut x = 3;"));
     assert!(p.read("src/lib.rs").contains("fn bar() {}"));
@@ -179,7 +179,7 @@ fn fix_two_files() {
         .build();
 
     p.expect_cmd("cargo-fix fix")
-        .env("__CARGO_FIX_YOLO", "true")
+        .fix_everything()
         .stderr_contains("[FIXING] src/bar.rs (1 fix)")
         .stderr_contains("[FIXING] src/lib.rs (1 fix)")
         .run();

cargo-fix/tests/all/subtargets.rs

@@ -40,7 +40,7 @@ fn fixes_missing_ampersand() {
         .build();
 
     p.expect_cmd("cargo fix -- --all-targets")
-        .env("__CARGO_FIX_YOLO", "true")
+        .fix_everything()
         .stdout("")
         .stderr_contains("[COMPILING] foo v0.1.0 (CWD)")
         .stderr_contains("[FIXING] build.rs (1 fix)")