diff --git a/Cargo.lock b/Cargo.lock
index 0c4d69745..bb620ff4e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -47,6 +47,15 @@ version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+[[package]]
+name = "anstyle-lossy"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f45c79b3b9413932fc255f2c19ca0d48eaab72c4ea1913bafaebf289cbc099f2"
+dependencies = [
+ "anstyle",
+]
+
[[package]]
name = "anstyle-parse"
version = "0.2.0"
@@ -65,6 +74,19 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "anstyle-svg"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "962f6d5681926dbe5503b71057202d6723a33abe464c983b1d160bca3095a3bb"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "anstyle-lossy",
+ "html-escape",
+ "unicode-width",
+]
+
[[package]]
name = "anstyle-wincon"
version = "3.0.1"
@@ -253,7 +275,7 @@ dependencies = [
"semver",
"serde",
"similar",
- "snapbox 0.4.17",
+ "snapbox",
"tame-index",
"time",
"toml",
@@ -263,13 +285,15 @@ dependencies = [
[[package]]
name = "cargo-test-macro"
-version = "0.1.0"
-source = "git+https://github.com/rust-lang/cargo#5613aac68d821652adf378d74e7ef1411cc31161"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97ac1bafdafa1bd989127f57b4b757e4b251a48600534d8c6b39afa731c4a3cb"
[[package]]
name = "cargo-test-support"
-version = "0.1.0"
-source = "git+https://github.com/rust-lang/cargo#5613aac68d821652adf378d74e7ef1411cc31161"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4e31b758a3c3f74ddeab348d8a19344f3a897b65b92eddec5ceb8383f452444"
dependencies = [
"anstream",
"anstyle",
@@ -281,27 +305,31 @@ dependencies = [
"flate2",
"git2",
"glob",
- "itertools 0.11.0",
+ "itertools 0.12.1",
"pasetors",
+ "regex",
"serde",
"serde_json",
- "snapbox 0.4.17",
+ "snapbox",
"tar",
"time",
"toml",
"url",
- "windows-sys 0.48.0",
+ "walkdir",
+ "windows-sys 0.52.0",
]
[[package]]
name = "cargo-util"
-version = "0.2.8"
-source = "git+https://github.com/rust-lang/cargo#5613aac68d821652adf378d74e7ef1411cc31161"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14104698cb1694d43c2ff73492468ccf2bb0b047071a9838d999eeba9e984ffa"
dependencies = [
"anyhow",
"core-foundation",
"filetime",
"hex",
+ "ignore",
"jobserver",
"libc",
"miow",
@@ -311,7 +339,7 @@ dependencies = [
"tempfile",
"tracing",
"walkdir",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -419,9 +447,9 @@ dependencies = [
[[package]]
name = "core-foundation"
-version = "0.9.3"
+version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
dependencies = [
"core-foundation-sys",
"libc",
@@ -429,9 +457,9 @@ dependencies = [
[[package]]
name = "core-foundation-sys"
-version = "0.8.4"
+version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
[[package]]
name = "cpufeatures"
@@ -444,8 +472,9 @@ dependencies = [
[[package]]
name = "crates-io"
-version = "0.39.1"
-source = "git+https://github.com/rust-lang/cargo#5613aac68d821652adf378d74e7ef1411cc31161"
+version = "0.40.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b7837d3d2ea5d21a399489029609840d95608bfdf1dc5fd8604392df4b219b3"
dependencies = [
"curl",
"percent-encoding",
@@ -537,24 +566,24 @@ checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df"
[[package]]
name = "curl"
-version = "0.4.44"
+version = "0.4.46"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22"
+checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6"
dependencies = [
"curl-sys",
"libc",
"openssl-probe",
"openssl-sys",
"schannel",
- "socket2 0.4.9",
- "winapi",
+ "socket2",
+ "windows-sys 0.52.0",
]
[[package]]
name = "curl-sys"
-version = "0.4.63+curl-8.1.2"
+version = "0.4.74+curl-8.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aeb0fef7046022a1e2ad67a004978f0e3cacb9e3123dc62ce768f92197b771dc"
+checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf"
dependencies = [
"cc",
"libc",
@@ -562,7 +591,7 @@ dependencies = [
"openssl-sys",
"pkg-config",
"vcpkg",
- "winapi",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -718,23 +747,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "errno"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
dependencies = [
- "cc",
"libc",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -761,21 +779,21 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
[[package]]
name = "filetime"
-version = "0.2.22"
+version = "0.2.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
+checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.3.5",
- "windows-sys 0.48.0",
+ "redox_syscall 0.4.1",
+ "windows-sys 0.52.0",
]
[[package]]
name = "flate2"
-version = "1.0.28"
+version = "1.0.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
dependencies = [
"crc32fast",
"libz-sys",
@@ -799,9 +817,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "form_urlencoded"
-version = "1.2.0"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
dependencies = [
"percent-encoding",
]
@@ -1026,6 +1044,15 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "html-escape"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476"
+dependencies = [
+ "utf8-width",
+]
+
[[package]]
name = "http"
version = "1.1.0"
@@ -1132,7 +1159,7 @@ dependencies = [
"http-body",
"hyper",
"pin-project-lite",
- "socket2 0.5.4",
+ "socket2",
"tokio",
"tower",
"tower-service",
@@ -1141,9 +1168,9 @@ dependencies = [
[[package]]
name = "idna"
-version = "0.4.0"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
dependencies = [
"unicode-bidi",
"unicode-normalization",
@@ -1189,9 +1216,9 @@ checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
[[package]]
name = "itertools"
-version = "0.11.0"
+version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
dependencies = [
"either",
]
@@ -1213,9 +1240,9 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
[[package]]
name = "jobserver"
-version = "0.1.27"
+version = "0.1.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
dependencies = [
"libc",
]
@@ -1277,9 +1304,9 @@ dependencies = [
[[package]]
name = "linux-raw-sys"
-version = "0.4.8"
+version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
[[package]]
name = "log"
@@ -1452,9 +1479,9 @@ dependencies = [
[[package]]
name = "pasetors"
-version = "0.6.7"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba765699a309908d55950919a3445e9491453e89b2587b1b2abe4143a48894c0"
+checksum = "6b36d47c66f2230dd1b7143d9afb2b4891879020210eddf2ccb624e529b96dba"
dependencies = [
"ct-codecs",
"ed25519-compact",
@@ -1482,9 +1509,9 @@ dependencies = [
[[package]]
name = "percent-encoding"
-version = "2.3.0"
+version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]]
name = "pin-project"
@@ -1643,15 +1670,6 @@ dependencies = [
"bitflags 1.3.2",
]
-[[package]]
-name = "redox_syscall"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-dependencies = [
- "bitflags 1.3.2",
-]
-
[[package]]
name = "redox_syscall"
version = "0.4.1"
@@ -1780,15 +1798,15 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
[[package]]
name = "rustix"
-version = "0.38.21"
+version = "0.38.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
dependencies = [
"bitflags 2.4.0",
"errno",
"libc",
"linux-raw-sys",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -1943,11 +1961,12 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.108"
+version = "1.0.121"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609"
dependencies = [
"itoa",
+ "memchr",
"ryu",
"serde",
]
@@ -2036,24 +2055,6 @@ dependencies = [
"serde",
]
-[[package]]
-name = "snapbox"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b831b6e80fbcd2889efa75b185d24005f85981431495f995292b25836519d84"
-dependencies = [
- "anstream",
- "anstyle",
- "content_inspector",
- "dunce",
- "filetime",
- "normalize-line-endings",
- "similar",
- "snapbox-macros",
- "tempfile",
- "walkdir",
-]
-
[[package]]
name = "snapbox"
version = "0.6.16"
@@ -2062,12 +2063,15 @@ checksum = "027c936207f85d10d015e21faf5c676c7e08c453ed371adf55c0874c443ca77a"
dependencies = [
"anstream",
"anstyle",
+ "anstyle-svg",
"content_inspector",
"dunce",
"filetime",
"libc",
"normalize-line-endings",
"os_pipe",
+ "regex",
+ "serde_json",
"similar",
"snapbox-macros",
"tempfile",
@@ -2085,16 +2089,6 @@ dependencies = [
"anstream",
]
-[[package]]
-name = "socket2"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
-dependencies = [
- "libc",
- "winapi",
-]
-
[[package]]
name = "socket2"
version = "0.5.4"
@@ -2192,15 +2186,14 @@ dependencies = [
[[package]]
name = "tempfile"
-version = "3.8.1"
+version = "3.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
dependencies = [
"cfg-if",
"fastrand",
- "redox_syscall 0.4.1",
"rustix",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -2221,18 +2214,18 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
[[package]]
name = "thiserror"
-version = "1.0.50"
+version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
dependencies = [
"proc-macro2",
"quote",
@@ -2297,7 +2290,7 @@ dependencies = [
"mio",
"num_cpus",
"pin-project-lite",
- "socket2 0.5.4",
+ "socket2",
"windows-sys 0.48.0",
]
@@ -2448,7 +2441,7 @@ dependencies = [
"rayon",
"serde",
"shlex",
- "snapbox 0.6.16",
+ "snapbox",
"toml_edit",
]
@@ -2498,6 +2491,12 @@ dependencies = [
"tinyvec",
]
+[[package]]
+name = "unicode-width"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+
[[package]]
name = "untrusted"
version = "0.9.0"
@@ -2506,15 +2505,21 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
[[package]]
name = "url"
-version = "2.4.1"
+version = "2.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
dependencies = [
"form_urlencoded",
"idna",
"percent-encoding",
]
+[[package]]
+name = "utf8-width"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
+
[[package]]
name = "utf8parse"
version = "0.2.1"
@@ -2544,9 +2549,9 @@ dependencies = [
[[package]]
name = "walkdir"
-version = "2.4.0"
+version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
dependencies = [
"same-file",
"winapi-util",
diff --git a/Cargo.toml b/Cargo.toml
index 81a242577..eca1d7428 100644
--- 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
index 6206904e6..d22312618 100644
--- 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
deleted file mode 100644
index 2d4b70324..000000000
--- a/tests/testsuite/version/downgrade_error/stderr.log
+++ /dev/null
@@ -1 +0,0 @@
-error: cannot downgrade sample from 0.0.1 to 0.1.0
diff --git a/tests/testsuite/version/downgrade_error/stderr.term.svg b/tests/testsuite/version/downgrade_error/stderr.term.svg
new file mode 100644
index 000000000..82c931ff3
--- /dev/null
+++ b/tests/testsuite/version/downgrade_error/stderr.term.svg
@@ -0,0 +1,25 @@
+
diff --git a/tests/testsuite/version/downgrade_error/stdout.log b/tests/testsuite/version/downgrade_error/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/version/downgrade_error/stdout.term.svg b/tests/testsuite/version/downgrade_error/stdout.term.svg
new file mode 100644
index 000000000..46f201ab8
--- /dev/null
+++ b/tests/testsuite/version/downgrade_error/stdout.term.svg
@@ -0,0 +1,21 @@
+
diff --git a/tests/testsuite/version/dry_run/mod.rs b/tests/testsuite/version/dry_run/mod.rs
index 1d8853b56..7666bc584 100644
--- 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
deleted file mode 100644
index 434134c07..000000000
--- a/tests/testsuite/version/dry_run/stderr.log
+++ /dev/null
@@ -1,3 +0,0 @@
-warning: push target `origin/master` doesn't exist
- Upgrading sample from 0.1.0 to 2.0.0
-warning: aborting release due to dry run; re-run with `--execute`
diff --git a/tests/testsuite/version/dry_run/stderr.term.svg b/tests/testsuite/version/dry_run/stderr.term.svg
new file mode 100644
index 000000000..878307b8c
--- /dev/null
+++ b/tests/testsuite/version/dry_run/stderr.term.svg
@@ -0,0 +1,29 @@
+
diff --git a/tests/testsuite/version/dry_run/stdout.log b/tests/testsuite/version/dry_run/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/version/dry_run/stdout.term.svg b/tests/testsuite/version/dry_run/stdout.term.svg
new file mode 100644
index 000000000..46f201ab8
--- /dev/null
+++ b/tests/testsuite/version/dry_run/stdout.term.svg
@@ -0,0 +1,21 @@
+
diff --git a/tests/testsuite/version/ignore_dependent/mod.rs b/tests/testsuite/version/ignore_dependent/mod.rs
index 5df9311c9..e81f92253 100644
--- 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
deleted file mode 100644
index 687ac03c0..000000000
--- a/tests/testsuite/version/ignore_dependent/stderr.log
+++ /dev/null
@@ -1,2 +0,0 @@
-warning: push target `origin/master` doesn't exist
- Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0
diff --git a/tests/testsuite/version/ignore_dependent/stderr.term.svg b/tests/testsuite/version/ignore_dependent/stderr.term.svg
new file mode 100644
index 000000000..670a5f75e
--- /dev/null
+++ b/tests/testsuite/version/ignore_dependent/stderr.term.svg
@@ -0,0 +1,27 @@
+
diff --git a/tests/testsuite/version/ignore_dependent/stdout.log b/tests/testsuite/version/ignore_dependent/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/version/ignore_dependent/stdout.term.svg b/tests/testsuite/version/ignore_dependent/stdout.term.svg
new file mode 100644
index 000000000..46f201ab8
--- /dev/null
+++ b/tests/testsuite/version/ignore_dependent/stdout.term.svg
@@ -0,0 +1,21 @@
+
diff --git a/tests/testsuite/version/set_absolute_version/mod.rs b/tests/testsuite/version/set_absolute_version/mod.rs
index 73134a875..4db4cdaca 100644
--- 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
deleted file mode 100644
index 98c6bd38a..000000000
--- a/tests/testsuite/version/set_absolute_version/stderr.log
+++ /dev/null
@@ -1,2 +0,0 @@
-warning: push target `origin/master` doesn't exist
- Upgrading sample from 0.1.0 to 2.0.0
diff --git a/tests/testsuite/version/set_absolute_version/stderr.term.svg b/tests/testsuite/version/set_absolute_version/stderr.term.svg
new file mode 100644
index 000000000..fcb887cb8
--- /dev/null
+++ b/tests/testsuite/version/set_absolute_version/stderr.term.svg
@@ -0,0 +1,27 @@
+
diff --git a/tests/testsuite/version/set_absolute_version/stdout.log b/tests/testsuite/version/set_absolute_version/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/version/set_absolute_version/stdout.term.svg b/tests/testsuite/version/set_absolute_version/stdout.term.svg
new file mode 100644
index 000000000..46f201ab8
--- /dev/null
+++ b/tests/testsuite/version/set_absolute_version/stdout.term.svg
@@ -0,0 +1,21 @@
+
diff --git a/tests/testsuite/version/set_absolute_workspace_version/mod.rs b/tests/testsuite/version/set_absolute_workspace_version/mod.rs
index c797f379b..af99c04bc 100644
--- 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
deleted file mode 100644
index a04743ca1..000000000
--- a/tests/testsuite/version/set_absolute_workspace_version/stderr.log
+++ /dev/null
@@ -1,5 +0,0 @@
-warning: push target `origin/master` doesn't exist
- Upgrading workspace to version 2.0.0
- Upgrading inherit_ws_version from 0.2.0 to 2.0.0 (inherited from workspace)
- Updating workspace's dependency from 0.2 to 2.0
- Updating with_direct_dep's dependency from 0.2 to 2.0
diff --git a/tests/testsuite/version/set_absolute_workspace_version/stderr.term.svg b/tests/testsuite/version/set_absolute_workspace_version/stderr.term.svg
new file mode 100644
index 000000000..d7cab430e
--- /dev/null
+++ b/tests/testsuite/version/set_absolute_workspace_version/stderr.term.svg
@@ -0,0 +1,33 @@
+
diff --git a/tests/testsuite/version/set_absolute_workspace_version/stdout.log b/tests/testsuite/version/set_absolute_workspace_version/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/version/set_absolute_workspace_version/stdout.term.svg b/tests/testsuite/version/set_absolute_workspace_version/stdout.term.svg
new file mode 100644
index 000000000..46f201ab8
--- /dev/null
+++ b/tests/testsuite/version/set_absolute_workspace_version/stdout.term.svg
@@ -0,0 +1,21 @@
+
diff --git a/tests/testsuite/version/set_relative_version/mod.rs b/tests/testsuite/version/set_relative_version/mod.rs
index d11d727a2..ac08a82d8 100644
--- a/tests/testsuite/version/set_relative_version/mod.rs
+++ b/tests/testsuite/version/set_relative_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_relative_version/stderr.log b/tests/testsuite/version/set_relative_version/stderr.log
deleted file mode 100644
index 33b50a6dc..000000000
--- a/tests/testsuite/version/set_relative_version/stderr.log
+++ /dev/null
@@ -1,2 +0,0 @@
-warning: push target `origin/master` doesn't exist
- Upgrading sample from 0.1.0 to 1.0.0
diff --git a/tests/testsuite/version/set_relative_version/stderr.term.svg b/tests/testsuite/version/set_relative_version/stderr.term.svg
new file mode 100644
index 000000000..62186437d
--- /dev/null
+++ b/tests/testsuite/version/set_relative_version/stderr.term.svg
@@ -0,0 +1,27 @@
+
diff --git a/tests/testsuite/version/set_relative_version/stdout.log b/tests/testsuite/version/set_relative_version/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/version/set_relative_version/stdout.term.svg b/tests/testsuite/version/set_relative_version/stdout.term.svg
new file mode 100644
index 000000000..46f201ab8
--- /dev/null
+++ b/tests/testsuite/version/set_relative_version/stdout.term.svg
@@ -0,0 +1,21 @@
+
diff --git a/tests/testsuite/version/set_relative_workspace_version/mod.rs b/tests/testsuite/version/set_relative_workspace_version/mod.rs
index bf9d77141..ebded162b 100644
--- a/tests/testsuite/version/set_relative_workspace_version/mod.rs
+++ b/tests/testsuite/version/set_relative_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_relative_workspace_version/stderr.log b/tests/testsuite/version/set_relative_workspace_version/stderr.log
deleted file mode 100644
index 38ea773eb..000000000
--- a/tests/testsuite/version/set_relative_workspace_version/stderr.log
+++ /dev/null
@@ -1,5 +0,0 @@
-warning: push target `origin/master` doesn't exist
- Upgrading workspace to version 1.0.0
- Upgrading inherit_ws_version from 0.2.0 to 1.0.0 (inherited from workspace)
- Updating workspace's dependency from 0.2 to 1.0
- Updating with_direct_dep's dependency from 0.2 to 1.0
diff --git a/tests/testsuite/version/set_relative_workspace_version/stderr.term.svg b/tests/testsuite/version/set_relative_workspace_version/stderr.term.svg
new file mode 100644
index 000000000..563ac343d
--- /dev/null
+++ b/tests/testsuite/version/set_relative_workspace_version/stderr.term.svg
@@ -0,0 +1,33 @@
+
diff --git a/tests/testsuite/version/set_relative_workspace_version/stdout.log b/tests/testsuite/version/set_relative_workspace_version/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/version/set_relative_workspace_version/stdout.term.svg b/tests/testsuite/version/set_relative_workspace_version/stdout.term.svg
new file mode 100644
index 000000000..46f201ab8
--- /dev/null
+++ b/tests/testsuite/version/set_relative_workspace_version/stdout.term.svg
@@ -0,0 +1,21 @@
+
diff --git a/tests/testsuite/version/upgrade_compatible_dependency/mod.rs b/tests/testsuite/version/upgrade_compatible_dependency/mod.rs
index f0181da20..89eaeb182 100644
--- a/tests/testsuite/version/upgrade_compatible_dependency/mod.rs
+++ b/tests/testsuite/version/upgrade_compatible_dependency/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/upgrade_compatible_dependency/stderr.log b/tests/testsuite/version/upgrade_compatible_dependency/stderr.log
deleted file mode 100644
index fcf301a1a..000000000
--- a/tests/testsuite/version/upgrade_compatible_dependency/stderr.log
+++ /dev/null
@@ -1,3 +0,0 @@
-warning: push target `origin/master` doesn't exist
- Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 0.4.5
- Updating cargo-list-test-fixture's dependency from 0.4.3 to 0.4.5
diff --git a/tests/testsuite/version/upgrade_compatible_dependency/stderr.term.svg b/tests/testsuite/version/upgrade_compatible_dependency/stderr.term.svg
new file mode 100644
index 000000000..41458cef2
--- /dev/null
+++ b/tests/testsuite/version/upgrade_compatible_dependency/stderr.term.svg
@@ -0,0 +1,29 @@
+
diff --git a/tests/testsuite/version/upgrade_compatible_dependency/stdout.log b/tests/testsuite/version/upgrade_compatible_dependency/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/version/upgrade_compatible_dependency/stdout.term.svg b/tests/testsuite/version/upgrade_compatible_dependency/stdout.term.svg
new file mode 100644
index 000000000..46f201ab8
--- /dev/null
+++ b/tests/testsuite/version/upgrade_compatible_dependency/stdout.term.svg
@@ -0,0 +1,21 @@
+
diff --git a/tests/testsuite/version/upgrade_incompatible_dependency/mod.rs b/tests/testsuite/version/upgrade_incompatible_dependency/mod.rs
index 51287051d..3271e9427 100644
--- a/tests/testsuite/version/upgrade_incompatible_dependency/mod.rs
+++ b/tests/testsuite/version/upgrade_incompatible_dependency/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/upgrade_incompatible_dependency/stderr.log b/tests/testsuite/version/upgrade_incompatible_dependency/stderr.log
deleted file mode 100644
index c128fe981..000000000
--- a/tests/testsuite/version/upgrade_incompatible_dependency/stderr.log
+++ /dev/null
@@ -1,3 +0,0 @@
-warning: push target `origin/master` doesn't exist
- Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0
- Updating cargo-list-test-fixture's dependency from 0.4.3 to 2.0.0
diff --git a/tests/testsuite/version/upgrade_incompatible_dependency/stderr.term.svg b/tests/testsuite/version/upgrade_incompatible_dependency/stderr.term.svg
new file mode 100644
index 000000000..f24b9965f
--- /dev/null
+++ b/tests/testsuite/version/upgrade_incompatible_dependency/stderr.term.svg
@@ -0,0 +1,29 @@
+
diff --git a/tests/testsuite/version/upgrade_incompatible_dependency/stdout.log b/tests/testsuite/version/upgrade_incompatible_dependency/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/version/upgrade_incompatible_dependency/stdout.term.svg b/tests/testsuite/version/upgrade_incompatible_dependency/stdout.term.svg
new file mode 100644
index 000000000..46f201ab8
--- /dev/null
+++ b/tests/testsuite/version/upgrade_incompatible_dependency/stdout.term.svg
@@ -0,0 +1,21 @@
+
diff --git a/tests/testsuite/version/upgrade_workspace/mod.rs b/tests/testsuite/version/upgrade_workspace/mod.rs
index 049fa5ff0..fad4461d7 100644
--- a/tests/testsuite/version/upgrade_workspace/mod.rs
+++ b/tests/testsuite/version/upgrade_workspace/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/upgrade_workspace/stderr.log b/tests/testsuite/version/upgrade_workspace/stderr.log
deleted file mode 100644
index 5c3194d5d..000000000
--- a/tests/testsuite/version/upgrade_workspace/stderr.log
+++ /dev/null
@@ -1,4 +0,0 @@
-warning: push target `origin/master` doesn't exist
- Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0
- Updating cargo-list-test-fixture's dependency from 0.4.3 to 2.0.0
- Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0
diff --git a/tests/testsuite/version/upgrade_workspace/stderr.term.svg b/tests/testsuite/version/upgrade_workspace/stderr.term.svg
new file mode 100644
index 000000000..e3c785226
--- /dev/null
+++ b/tests/testsuite/version/upgrade_workspace/stderr.term.svg
@@ -0,0 +1,31 @@
+
diff --git a/tests/testsuite/version/upgrade_workspace/stdout.log b/tests/testsuite/version/upgrade_workspace/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/version/upgrade_workspace/stdout.term.svg b/tests/testsuite/version/upgrade_workspace/stdout.term.svg
new file mode 100644
index 000000000..46f201ab8
--- /dev/null
+++ b/tests/testsuite/version/upgrade_workspace/stdout.term.svg
@@ -0,0 +1,21 @@
+
diff --git a/tests/testsuite/version/virtual_workspace_deps/mod.rs b/tests/testsuite/version/virtual_workspace_deps/mod.rs
index 049fa5ff0..fad4461d7 100644
--- a/tests/testsuite/version/virtual_workspace_deps/mod.rs
+++ b/tests/testsuite/version/virtual_workspace_deps/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/virtual_workspace_deps/stderr.log b/tests/testsuite/version/virtual_workspace_deps/stderr.log
deleted file mode 100644
index d2b3c3f14..000000000
--- a/tests/testsuite/version/virtual_workspace_deps/stderr.log
+++ /dev/null
@@ -1,4 +0,0 @@
-warning: push target `origin/master` doesn't exist
- Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0
- Updating workspace's dependency from 0.4.3 to 2.0.0
- Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0
diff --git a/tests/testsuite/version/virtual_workspace_deps/stderr.term.svg b/tests/testsuite/version/virtual_workspace_deps/stderr.term.svg
new file mode 100644
index 000000000..edc08fbb5
--- /dev/null
+++ b/tests/testsuite/version/virtual_workspace_deps/stderr.term.svg
@@ -0,0 +1,31 @@
+
diff --git a/tests/testsuite/version/virtual_workspace_deps/stdout.log b/tests/testsuite/version/virtual_workspace_deps/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/version/virtual_workspace_deps/stdout.term.svg b/tests/testsuite/version/virtual_workspace_deps/stdout.term.svg
new file mode 100644
index 000000000..46f201ab8
--- /dev/null
+++ b/tests/testsuite/version/virtual_workspace_deps/stdout.term.svg
@@ -0,0 +1,21 @@
+
diff --git a/tests/testsuite/version/workspace_deps/mod.rs b/tests/testsuite/version/workspace_deps/mod.rs
index 049fa5ff0..fad4461d7 100644
--- a/tests/testsuite/version/workspace_deps/mod.rs
+++ b/tests/testsuite/version/workspace_deps/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/workspace_deps/stderr.log b/tests/testsuite/version/workspace_deps/stderr.log
deleted file mode 100644
index d2b3c3f14..000000000
--- a/tests/testsuite/version/workspace_deps/stderr.log
+++ /dev/null
@@ -1,4 +0,0 @@
-warning: push target `origin/master` doesn't exist
- Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0
- Updating workspace's dependency from 0.4.3 to 2.0.0
- Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0
diff --git a/tests/testsuite/version/workspace_deps/stderr.term.svg b/tests/testsuite/version/workspace_deps/stderr.term.svg
new file mode 100644
index 000000000..edc08fbb5
--- /dev/null
+++ b/tests/testsuite/version/workspace_deps/stderr.term.svg
@@ -0,0 +1,31 @@
+
diff --git a/tests/testsuite/version/workspace_deps/stdout.log b/tests/testsuite/version/workspace_deps/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/version/workspace_deps/stdout.term.svg b/tests/testsuite/version/workspace_deps/stdout.term.svg
new file mode 100644
index 000000000..46f201ab8
--- /dev/null
+++ b/tests/testsuite/version/workspace_deps/stdout.term.svg
@@ -0,0 +1,21 @@
+
diff --git a/tests/testsuite/version/workspace_version_exclude/mod.rs b/tests/testsuite/version/workspace_version_exclude/mod.rs
index 66c49b6c6..54aabae42 100644
--- a/tests/testsuite/version/workspace_version_exclude/mod.rs
+++ b/tests/testsuite/version/workspace_version_exclude/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;
@@ -26,8 +27,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/workspace_version_exclude/stderr.log b/tests/testsuite/version/workspace_version_exclude/stderr.log
deleted file mode 100644
index 82b39f809..000000000
--- a/tests/testsuite/version/workspace_version_exclude/stderr.log
+++ /dev/null
@@ -1,8 +0,0 @@
-warning: push target `origin/master` doesn't exist
- Upgrading workspace to version 2.0.0
- Upgrading inherits-version from 0.1.0 to 2.0.0 (inherited from workspace)
- Updating workspace's dependency from 0.1.0 to 2.0.0
- Upgrading independent-version from 0.1.0 to 2.0.0
- Updating workspace's dependency from 0.1.0 to 2.0.0
- Updating workspace's dependency from 0.1.0 to 2.0.0
- Upgrading root from 0.1.0 to 2.0.0 (inherited from workspace)
diff --git a/tests/testsuite/version/workspace_version_exclude/stderr.term.svg b/tests/testsuite/version/workspace_version_exclude/stderr.term.svg
new file mode 100644
index 000000000..ca92c5800
--- /dev/null
+++ b/tests/testsuite/version/workspace_version_exclude/stderr.term.svg
@@ -0,0 +1,39 @@
+
diff --git a/tests/testsuite/version/workspace_version_exclude/stdout.log b/tests/testsuite/version/workspace_version_exclude/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/version/workspace_version_exclude/stdout.term.svg b/tests/testsuite/version/workspace_version_exclude/stdout.term.svg
new file mode 100644
index 000000000..46f201ab8
--- /dev/null
+++ b/tests/testsuite/version/workspace_version_exclude/stdout.term.svg
@@ -0,0 +1,21 @@
+
diff --git a/tests/testsuite/version/workspace_version_subset/mod.rs b/tests/testsuite/version/workspace_version_subset/mod.rs
index 12780b4c6..86e724953 100644
--- a/tests/testsuite/version/workspace_version_subset/mod.rs
+++ b/tests/testsuite/version/workspace_version_subset/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/workspace_version_subset/stderr.log b/tests/testsuite/version/workspace_version_subset/stderr.log
deleted file mode 100644
index 35cd3bcc9..000000000
--- a/tests/testsuite/version/workspace_version_subset/stderr.log
+++ /dev/null
@@ -1,5 +0,0 @@
-warning: push target `origin/master` doesn't exist
- Upgrading workspace to version 2.0.0
- Upgrading root from 0.1.0 to 2.0.0 (inherited from workspace)
- Upgrading inherits-version from 0.1.0 to 2.0.0 (inherited from workspace)
- Updating workspace's dependency from 0.1.0 to 2.0.0
diff --git a/tests/testsuite/version/workspace_version_subset/stderr.term.svg b/tests/testsuite/version/workspace_version_subset/stderr.term.svg
new file mode 100644
index 000000000..65f029c27
--- /dev/null
+++ b/tests/testsuite/version/workspace_version_subset/stderr.term.svg
@@ -0,0 +1,33 @@
+
diff --git a/tests/testsuite/version/workspace_version_subset/stdout.log b/tests/testsuite/version/workspace_version_subset/stdout.log
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/testsuite/version/workspace_version_subset/stdout.term.svg b/tests/testsuite/version/workspace_version_subset/stdout.term.svg
new file mode 100644
index 000000000..46f201ab8
--- /dev/null
+++ b/tests/testsuite/version/workspace_version_subset/stdout.term.svg
@@ -0,0 +1,21 @@
+