chore: Upgrade cargo-test-support

killercup · Sep 16, 2024 · 0d0cdb4 · 0d0cdb4
1 parent ce36ff5
commit 0d0cdb4
Show file tree

Hide file tree

Showing 263 changed files with 3,735 additions and 923 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -92,9 +92,9 @@ predicates = { version = "3.0.3", features = ["color"] }
 assert_cmd = { version = "2.0.12", features = ["color-auto"] }
 assert_fs = { version = "1.0.13", features = ["color-auto"] }
 trycmd = "0.14.17"
-snapbox = { version = "0.4.12", features = ["cmd", "path"] }
-cargo-test-macro.git = "https://github.com/rust-lang/cargo"
-cargo-test-support.git = "https://github.com/rust-lang/cargo"
+snapbox = { version = "0.6.9", features = ["cmd", "path"] }
+cargo-test-macro = "0.3"
+cargo-test-support = "0.3"
 url = "2.4.0"
 
 [features]

diff --git a/tests/cargo-set-version/downgrade_error/mod.rs b/tests/cargo-set-version/downgrade_error/mod.rs
@@ -1,14 +1,15 @@
 use cargo_test_support::compare::assert_ui;
+use cargo_test_support::file;
 use cargo_test_support::Project;
 
 use crate::init_registry;
 use crate::CargoCommand;
-use cargo_test_support::curr_dir;
+use cargo_test_support::current_dir;
 
 #[cargo_test]
 fn case() {
     init_registry();
-    let project = Project::from_template(curr_dir!().join("in"));
+    let project = Project::from_template(current_dir!().join("in"));
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -18,8 +19,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(1)
-        .stdout_matches_path(curr_dir!().join("stdout.log"))
-        .stderr_matches_path(curr_dir!().join("stderr.log"));
+        .stdout_eq(file!["stdout.term.svg"])
+        .stderr_eq(file!["stderr.term.svg"]);
 
-    assert_ui().subset_matches(curr_dir!().join("out"), &project_root);
+    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/cargo-set-version/downgrade_error/stderr.log b/tests/cargo-set-version/downgrade_error/stderr.log
diff --git a/tests/cargo-set-version/downgrade_error/stderr.term.svg b/tests/cargo-set-version/downgrade_error/stderr.term.svg
diff --git a/tests/cargo-set-version/downgrade_error/stdout.log b/tests/cargo-set-version/downgrade_error/stdout.log
diff --git a/tests/cargo-set-version/downgrade_error/stdout.term.svg b/tests/cargo-set-version/downgrade_error/stdout.term.svg
diff --git a/tests/cargo-set-version/dry_run/mod.rs b/tests/cargo-set-version/dry_run/mod.rs
@@ -1,14 +1,15 @@
 use cargo_test_support::compare::assert_ui;
+use cargo_test_support::file;
 use cargo_test_support::Project;
 
 use crate::init_registry;
 use crate::CargoCommand;
-use cargo_test_support::curr_dir;
+use cargo_test_support::current_dir;
 
 #[cargo_test]
 fn case() {
     init_registry();
-    let project = Project::from_template(curr_dir!().join("in"));
+    let project = Project::from_template(current_dir!().join("in"));
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -18,8 +19,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path(curr_dir!().join("stdout.log"))
-        .stderr_matches_path(curr_dir!().join("stderr.log"));
+        .stdout_eq(file!["stdout.term.svg"])
+        .stderr_eq(file!["stderr.term.svg"]);
 
-    assert_ui().subset_matches(curr_dir!().join("out"), &project_root);
+    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/cargo-set-version/dry_run/stderr.log b/tests/cargo-set-version/dry_run/stderr.log
diff --git a/tests/cargo-set-version/dry_run/stderr.term.svg b/tests/cargo-set-version/dry_run/stderr.term.svg
diff --git a/tests/cargo-set-version/dry_run/stdout.log b/tests/cargo-set-version/dry_run/stdout.log
diff --git a/tests/cargo-set-version/dry_run/stdout.term.svg b/tests/cargo-set-version/dry_run/stdout.term.svg
diff --git a/tests/cargo-set-version/ignore_dependent/mod.rs b/tests/cargo-set-version/ignore_dependent/mod.rs
@@ -1,14 +1,15 @@
 use cargo_test_support::compare::assert_ui;
+use cargo_test_support::file;
 use cargo_test_support::Project;
 
 use crate::init_registry;
 use crate::CargoCommand;
-use cargo_test_support::curr_dir;
+use cargo_test_support::current_dir;
 
 #[cargo_test]
 fn case() {
     init_registry();
-    let project = Project::from_template(curr_dir!().join("in"));
+    let project = Project::from_template(current_dir!().join("in"));
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -18,8 +19,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path(curr_dir!().join("stdout.log"))
-        .stderr_matches_path(curr_dir!().join("stderr.log"));
+        .stdout_eq(file!["stdout.term.svg"])
+        .stderr_eq(file!["stderr.term.svg"]);
 
-    assert_ui().subset_matches(curr_dir!().join("out"), &project_root);
+    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/cargo-set-version/ignore_dependent/stderr.log b/tests/cargo-set-version/ignore_dependent/stderr.log
diff --git a/tests/cargo-set-version/ignore_dependent/stderr.term.svg b/tests/cargo-set-version/ignore_dependent/stderr.term.svg
diff --git a/tests/cargo-set-version/ignore_dependent/stdout.log b/tests/cargo-set-version/ignore_dependent/stdout.log
diff --git a/tests/cargo-set-version/ignore_dependent/stdout.term.svg b/tests/cargo-set-version/ignore_dependent/stdout.term.svg
diff --git a/tests/cargo-set-version/relative_absolute_conflict/mod.rs b/tests/cargo-set-version/relative_absolute_conflict/mod.rs
@@ -1,14 +1,15 @@
 use cargo_test_support::compare::assert_ui;
+use cargo_test_support::file;
 use cargo_test_support::Project;
 
 use crate::init_registry;
 use crate::CargoCommand;
-use cargo_test_support::curr_dir;
+use cargo_test_support::current_dir;
 
 #[cargo_test]
 fn case() {
     init_registry();
-    let project = Project::from_template(curr_dir!().join("in"));
+    let project = Project::from_template(current_dir!().join("in"));
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -18,8 +19,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(2)
-        .stdout_matches_path(curr_dir!().join("stdout.log"))
-        .stderr_matches_path(curr_dir!().join("stderr.log"));
+        .stdout_eq(file!["stdout.term.svg"])
+        .stderr_eq(file!["stderr.term.svg"]);
 
-    assert_ui().subset_matches(curr_dir!().join("out"), &project_root);
+    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/cargo-set-version/relative_absolute_conflict/stderr.log b/tests/cargo-set-version/relative_absolute_conflict/stderr.log
diff --git a/tests/cargo-set-version/relative_absolute_conflict/stderr.term.svg b/tests/cargo-set-version/relative_absolute_conflict/stderr.term.svg
diff --git a/tests/cargo-set-version/relative_absolute_conflict/stdout.log b/tests/cargo-set-version/relative_absolute_conflict/stdout.log
diff --git a/tests/cargo-set-version/relative_absolute_conflict/stdout.term.svg b/tests/cargo-set-version/relative_absolute_conflict/stdout.term.svg
diff --git a/tests/cargo-set-version/set_absolute_version/mod.rs b/tests/cargo-set-version/set_absolute_version/mod.rs
@@ -1,14 +1,15 @@
 use cargo_test_support::compare::assert_ui;
+use cargo_test_support::file;
 use cargo_test_support::Project;
 
 use crate::init_registry;
 use crate::CargoCommand;
-use cargo_test_support::curr_dir;
+use cargo_test_support::current_dir;
 
 #[cargo_test]
 fn case() {
     init_registry();
-    let project = Project::from_template(curr_dir!().join("in"));
+    let project = Project::from_template(current_dir!().join("in"));
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -18,8 +19,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .success()
-        .stdout_matches_path(curr_dir!().join("stdout.log"))
-        .stderr_matches_path(curr_dir!().join("stderr.log"));
+        .stdout_eq(file!["stdout.term.svg"])
+        .stderr_eq(file!["stderr.term.svg"]);
 
-    assert_ui().subset_matches(curr_dir!().join("out"), &project_root);
+    assert_ui().subset_matches(current_dir!().join("out"), &project_root);
 }
diff --git a/tests/cargo-set-version/set_absolute_version/stderr.log b/tests/cargo-set-version/set_absolute_version/stderr.log