chore: Switch cargo-test-support to registry

crate-ci · Aug 1, 2024 · 6278f33 · 6278f33
1 parent ef44ea1
commit 6278f33
Show file tree

Hide file tree

Showing 72 changed files with 925 additions and 239 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -164,9 +164,9 @@ anstyle = "1.0.7"
 [dev-dependencies]
 assert_fs = "1.1"
 predicates = "3.1"
-snapbox = "0.4.16"
-cargo-test-macro.git = "https://github.com/rust-lang/cargo"
-cargo-test-support.git = "https://github.com/rust-lang/cargo"
+snapbox = "0.6.16"
+cargo-test-macro = "0.2.1"
+cargo-test-support = "0.2.1"
 
 [profile.release]
 panic = "abort"

diff --git a/tests/testsuite/version/downgrade_error/mod.rs b/tests/testsuite/version/downgrade_error/mod.rs
@@ -1,14 +1,15 @@
 use cargo_test_support::compare::assert_ui;
+use cargo_test_support::current_dir;
+use cargo_test_support::file;
 
 use crate::git_from;
 use crate::init_registry;
 use crate::CargoCommand;
-use cargo_test_support::curr_dir;
 
 #[cargo_test]
 fn case() {
     init_registry();
-    let project = git_from(curr_dir!().join("in"));
+    let project = git_from(current_dir!().join("in"));
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -18,8 +19,8 @@ fn case() {
         .current_dir(cwd)
         .assert()
         .code(101)
-        .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/testsuite/version/downgrade_error/stderr.log b/tests/testsuite/version/downgrade_error/stderr.log
diff --git a/tests/testsuite/version/downgrade_error/stderr.term.svg b/tests/testsuite/version/downgrade_error/stderr.term.svg
diff --git a/tests/testsuite/version/downgrade_error/stdout.log b/tests/testsuite/version/downgrade_error/stdout.log
diff --git a/tests/testsuite/version/downgrade_error/stdout.term.svg b/tests/testsuite/version/downgrade_error/stdout.term.svg
diff --git a/tests/testsuite/version/dry_run/mod.rs b/tests/testsuite/version/dry_run/mod.rs
@@ -1,14 +1,15 @@
 use cargo_test_support::compare::assert_ui;
+use cargo_test_support::current_dir;
+use cargo_test_support::file;
 
 use crate::git_from;
 use crate::init_registry;
 use crate::CargoCommand;
-use cargo_test_support::curr_dir;
 
 #[cargo_test]
 fn case() {
     init_registry();
-    let project = git_from(curr_dir!().join("in"));
+    let project = git_from(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/testsuite/version/dry_run/stderr.log b/tests/testsuite/version/dry_run/stderr.log
diff --git a/tests/testsuite/version/dry_run/stderr.term.svg b/tests/testsuite/version/dry_run/stderr.term.svg
diff --git a/tests/testsuite/version/dry_run/stdout.log b/tests/testsuite/version/dry_run/stdout.log
diff --git a/tests/testsuite/version/dry_run/stdout.term.svg b/tests/testsuite/version/dry_run/stdout.term.svg
diff --git a/tests/testsuite/version/ignore_dependent/mod.rs b/tests/testsuite/version/ignore_dependent/mod.rs
@@ -1,14 +1,15 @@
 use cargo_test_support::compare::assert_ui;
+use cargo_test_support::current_dir;
+use cargo_test_support::file;
 
 use crate::git_from;
 use crate::init_registry;
 use crate::CargoCommand;
-use cargo_test_support::curr_dir;
 
 #[cargo_test]
 fn case() {
     init_registry();
-    let project = git_from(curr_dir!().join("in"));
+    let project = git_from(current_dir!().join("in"));
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -25,8 +26,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/testsuite/version/ignore_dependent/stderr.log b/tests/testsuite/version/ignore_dependent/stderr.log
diff --git a/tests/testsuite/version/ignore_dependent/stderr.term.svg b/tests/testsuite/version/ignore_dependent/stderr.term.svg
diff --git a/tests/testsuite/version/ignore_dependent/stdout.log b/tests/testsuite/version/ignore_dependent/stdout.log
diff --git a/tests/testsuite/version/ignore_dependent/stdout.term.svg b/tests/testsuite/version/ignore_dependent/stdout.term.svg
diff --git a/tests/testsuite/version/set_absolute_version/mod.rs b/tests/testsuite/version/set_absolute_version/mod.rs
@@ -1,14 +1,15 @@
 use cargo_test_support::compare::assert_ui;
+use cargo_test_support::current_dir;
+use cargo_test_support::file;
 
 use crate::git_from;
 use crate::init_registry;
 use crate::CargoCommand;
-use cargo_test_support::curr_dir;
 
 #[cargo_test]
 fn case() {
     init_registry();
-    let project = git_from(curr_dir!().join("in"));
+    let project = git_from(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/testsuite/version/set_absolute_version/stderr.log b/tests/testsuite/version/set_absolute_version/stderr.log
diff --git a/tests/testsuite/version/set_absolute_version/stderr.term.svg b/tests/testsuite/version/set_absolute_version/stderr.term.svg
diff --git a/tests/testsuite/version/set_absolute_version/stdout.log b/tests/testsuite/version/set_absolute_version/stdout.log
diff --git a/tests/testsuite/version/set_absolute_version/stdout.term.svg b/tests/testsuite/version/set_absolute_version/stdout.term.svg
diff --git a/tests/testsuite/version/set_absolute_workspace_version/mod.rs b/tests/testsuite/version/set_absolute_workspace_version/mod.rs
@@ -1,14 +1,15 @@
 use cargo_test_support::compare::assert_ui;
+use cargo_test_support::current_dir;
+use cargo_test_support::file;
 
 use crate::git_from;
 use crate::init_registry;
 use crate::CargoCommand;
-use cargo_test_support::curr_dir;
 
 #[cargo_test]
 fn case() {
     init_registry();
-    let project = git_from(curr_dir!().join("in"));
+    let project = git_from(current_dir!().join("in"));
     let project_root = project.root();
     let cwd = &project_root;
 
@@ -25,8 +26,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/testsuite/version/set_absolute_workspace_version/stderr.log b/tests/testsuite/version/set_absolute_workspace_version/stderr.log