feat(test-support): Make it easy to launch cargo

This commit is contained in:
Ed Page 2022-04-19 11:54:42 -05:00
parent 9a3d99b6c5
commit 83d444040c
2 changed files with 117 additions and 110 deletions

View File

@ -60,6 +60,7 @@ pub mod registry;
pub mod tools;
pub mod prelude {
pub use crate::CargoCommand;
pub use crate::ChannelChanger;
pub use crate::TestEnv;
}
@ -1229,6 +1230,19 @@ impl TestEnv for snapbox::cmd::Command {
}
}
/// Test the cargo command
pub trait CargoCommand {
fn cargo() -> Self;
}
impl CargoCommand for snapbox::cmd::Command {
fn cargo() -> Self {
Self::new(cargo_exe())
.with_assert(compare::assert())
.test_env()
}
}
fn split_and_add_args(p: &mut ProcessBuilder, s: &str) {
for mut arg in s.split_whitespace() {
if (arg.starts_with('"') && arg.ends_with('"'))

View File

@ -1,14 +1,7 @@
use cargo_test_support::cargo_exe;
use cargo_test_support::compare::assert;
use cargo_test_support::prelude::*;
use cargo_test_support::Project;
pub fn cargo_command() -> snapbox::cmd::Command {
snapbox::cmd::Command::new(cargo_exe())
.with_assert(assert())
.test_env()
}
fn init_registry() {
cargo_test_support::registry::init();
add_registry_packages(false);
@ -99,7 +92,7 @@ fn add_basic() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package"])
.current_dir(cwd)
@ -118,7 +111,7 @@ fn add_multiple() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package1", "my-package2"])
.current_dir(cwd)
@ -137,7 +130,7 @@ fn quiet() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["--quiet", "your-face"])
.current_dir(cwd)
@ -156,7 +149,7 @@ fn add_normalized_name_external() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["linked_hash_map", "Inflector"])
.current_dir(cwd)
@ -178,7 +171,7 @@ fn infer_prerelease() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["prerelease_only"])
.current_dir(cwd)
@ -197,7 +190,7 @@ fn build() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["--build", "my-build-package1", "my-build-package2"])
.current_dir(cwd)
@ -216,7 +209,7 @@ fn build_prefer_existing_version() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["cargo-list-test-fixture-dependency", "--build"])
.current_dir(cwd)
@ -238,7 +231,7 @@ fn default_features() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package1", "my-package2@0.4.1", "--default-features"])
.current_dir(cwd)
@ -257,7 +250,7 @@ fn require_weak() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["your-face", "--no-optional"])
.current_dir(cwd)
@ -276,7 +269,7 @@ fn detect_workspace_inherit() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.masquerade_as_nightly_cargo()
.arg("add")
.args(["foo", "-p", "bar"])
@ -300,7 +293,7 @@ fn detect_workspace_inherit_features() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.masquerade_as_nightly_cargo()
.arg("add")
.args(["foo", "-p", "bar", "--features", "test"])
@ -324,7 +317,7 @@ fn detect_workspace_inherit_optional() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.masquerade_as_nightly_cargo()
.arg("add")
.args(["foo", "-p", "bar", "--optional"])
@ -347,7 +340,7 @@ fn dev() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["--dev", "my-dev-package1", "my-dev-package2"])
.current_dir(cwd)
@ -366,7 +359,7 @@ fn dev_build_conflict() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package", "--dev", "--build"])
.current_dir(cwd)
@ -385,7 +378,7 @@ fn dev_prefer_existing_version() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["cargo-list-test-fixture-dependency", "--dev"])
.current_dir(cwd)
@ -407,7 +400,7 @@ fn dry_run() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package", "--dry-run"])
.current_dir(cwd)
@ -426,7 +419,7 @@ fn features() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["your-face", "--features", "eyes"])
.current_dir(cwd)
@ -445,7 +438,7 @@ fn features_empty() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["your-face", "--features", ""])
.current_dir(cwd)
@ -464,7 +457,7 @@ fn features_multiple_occurrences() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["your-face", "--features", "eyes", "--features", "nose"])
.current_dir(cwd)
@ -486,7 +479,7 @@ fn features_preserve() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["your-face"])
.current_dir(cwd)
@ -505,7 +498,7 @@ fn features_spaced_values() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["your-face", "--features", "eyes nose"])
.current_dir(cwd)
@ -527,7 +520,7 @@ fn features_unknown() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["your-face", "--features", "noze"])
.current_dir(cwd)
@ -555,7 +548,7 @@ fn git() {
});
let git_url = git_dep.url().to_string();
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["git-package", "--git", &git_url])
.current_dir(cwd)
@ -583,7 +576,7 @@ fn git_inferred_name() {
});
let git_url = git_dep.url().to_string();
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["--git", &git_url])
.current_dir(cwd)
@ -616,7 +609,7 @@ fn git_inferred_name_multiple() {
});
let git_url = git_dep.url().to_string();
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["--git", &git_url])
.current_dir(cwd)
@ -647,7 +640,7 @@ fn git_normalized_name() {
});
let git_url = git_dep.url().to_string();
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["git_package", "--git", &git_url])
.current_dir(cwd)
@ -675,7 +668,7 @@ fn invalid_git_name() {
});
let git_url = git_dep.url().to_string();
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["not-in-git", "--git", &git_url])
.current_dir(cwd)
@ -706,7 +699,7 @@ fn git_branch() {
git_repo.branch(branch, &find_head(), false).unwrap();
let git_url = git_dep.url().to_string();
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["git-package", "--git", &git_url, "--branch", branch])
.current_dir(cwd)
@ -725,7 +718,7 @@ fn git_conflicts_namever() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args([
"my-package@0.4.3",
@ -760,7 +753,7 @@ fn git_registry() {
});
let git_url = git_dep.url().to_string();
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args([
"versioned-package",
@ -794,7 +787,7 @@ fn git_dev() {
});
let git_url = git_dep.url().to_string();
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["git-package", "--git", &git_url, "--dev"])
.current_dir(cwd)
@ -824,7 +817,7 @@ fn git_rev() {
let head = find_head().id().to_string();
let git_url = git_dep.url().to_string();
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["git-package", "--git", &git_url, "--rev", &head])
.current_dir(cwd)
@ -854,7 +847,7 @@ fn git_tag() {
cargo_test_support::git::tag(&git_repo, tag);
let git_url = git_dep.url().to_string();
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["git-package", "--git", &git_url, "--tag", tag])
.current_dir(cwd)
@ -873,7 +866,7 @@ fn path() {
let project_root = project.root();
let cwd = project_root.join("primary");
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args([
"cargo-list-test-fixture-dependency",
@ -896,7 +889,7 @@ fn path_inferred_name() {
let project_root = project.root();
let cwd = project_root.join("primary");
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args([
"cargo-list-test-fixture-dependency",
@ -920,7 +913,7 @@ fn path_inferred_name_conflicts_full_feature() {
let project_root = project.root();
let cwd = project_root.join("primary");
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["--path", "../dependency", "--features", "your-face/nose"])
.current_dir(&cwd)
@ -944,7 +937,7 @@ fn path_normalized_name() {
let project_root = project.root();
let cwd = project_root.join("primary");
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args([
"cargo_list_test_fixture_dependency",
@ -970,7 +963,7 @@ fn invalid_path_name() {
let project_root = project.root();
let cwd = project_root.join("primary");
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["not-at-path", "--path", "../dependency"])
.current_dir(&cwd)
@ -989,7 +982,7 @@ fn path_dev() {
let project_root = project.root();
let cwd = project_root.join("primary");
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args([
"cargo-list-test-fixture-dependency",
@ -1013,7 +1006,7 @@ fn invalid_arg() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package", "--flag"])
.current_dir(cwd)
@ -1035,7 +1028,7 @@ fn invalid_git_external() {
.unwrap()
.to_string();
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["fake-git", "--git", &git_url])
.current_dir(cwd)
@ -1056,7 +1049,7 @@ fn invalid_key_inherit_dependency() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.masquerade_as_nightly_cargo()
.arg("add")
.args(["foo", "--default-features", "-p", "bar"])
@ -1079,7 +1072,7 @@ fn invalid_key_rename_inherit_dependency() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.masquerade_as_nightly_cargo()
.arg("add")
.args(["--rename", "foo", "foo-alt", "-p", "bar"])
@ -1102,7 +1095,7 @@ fn invalid_key_overwrite_inherit_dependency() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.masquerade_as_nightly_cargo()
.arg("add")
.args(["foo", "--default-features", "-p", "bar"])
@ -1125,7 +1118,7 @@ fn invalid_path() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args([
"cargo-list-test-fixture",
@ -1148,7 +1141,7 @@ fn invalid_path_self() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["cargo-list-test-fixture", "--path", "."])
.current_dir(cwd)
@ -1167,7 +1160,7 @@ fn invalid_manifest() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package"])
.current_dir(cwd)
@ -1186,7 +1179,7 @@ fn invalid_name_external() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["lets_hope_nobody_ever_publishes_this_crate"])
.current_dir(cwd)
@ -1208,7 +1201,7 @@ fn invalid_target_empty() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package", "--target", ""])
.current_dir(cwd)
@ -1230,7 +1223,7 @@ fn invalid_vers() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package@invalid version string"])
.current_dir(cwd)
@ -1249,7 +1242,7 @@ fn list_features() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["your-face"])
.current_dir(cwd)
@ -1268,7 +1261,7 @@ fn list_features_path() {
let project_root = project.root();
let cwd = project_root.join("primary");
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["your-face", "--path", "../dependency"])
.current_dir(&cwd)
@ -1287,7 +1280,7 @@ fn list_features_path_no_default() {
let project_root = project.root();
let cwd = project_root.join("primary");
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args([
"your-face",
@ -1314,7 +1307,7 @@ fn manifest_path_package() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args([
"--manifest-path",
@ -1341,7 +1334,7 @@ fn merge_activated_features() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.masquerade_as_nightly_cargo()
.arg("add")
.args(["foo", "-p", "bar"])
@ -1364,7 +1357,7 @@ fn multiple_conflicts_with_features() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package1", "your-face", "--features", "nose"])
.current_dir(cwd)
@ -1400,7 +1393,7 @@ fn git_multiple_names() {
});
let git_url = git_dep.url().to_string();
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package1", "my-package2", "--git", &git_url])
.current_dir(cwd)
@ -1419,7 +1412,7 @@ fn multiple_conflicts_with_rename() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package1", "my-package2", "--rename", "renamed"])
.current_dir(cwd)
@ -1441,7 +1434,7 @@ fn namever() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package1@>=0.1.1", "my-package2@0.2.3", "my-package"])
.current_dir(cwd)
@ -1460,7 +1453,7 @@ fn no_args() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.current_dir(cwd)
.assert()
@ -1478,7 +1471,7 @@ fn no_default_features() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package1", "my-package2@0.4.1", "--no-default-features"])
.current_dir(cwd)
@ -1497,7 +1490,7 @@ fn no_optional() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package1", "my-package2@0.4.1", "--no-optional"])
.current_dir(cwd)
@ -1516,7 +1509,7 @@ fn optional() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package1", "my-package2@0.4.1", "--optional"])
.current_dir(cwd)
@ -1535,7 +1528,7 @@ fn overwrite_default_features() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package1", "my-package2@0.4.1", "--default-features"])
.current_dir(cwd)
@ -1559,7 +1552,7 @@ fn overwrite_default_features_with_no_default_features() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package1", "my-package2@0.4.1", "--no-default-features"])
.current_dir(cwd)
@ -1585,7 +1578,7 @@ fn overwrite_features() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["your-face", "--features", "nose"])
.current_dir(cwd)
@ -1604,7 +1597,7 @@ fn overwrite_git_with_path() {
let project_root = project.root();
let cwd = project_root.join("primary");
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args([
"cargo-list-test-fixture-dependency",
@ -1630,7 +1623,7 @@ fn overwrite_inline_features() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args([
"unrelateed-crate",
@ -1657,7 +1650,7 @@ fn overwrite_inherit_features_noop() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.masquerade_as_nightly_cargo()
.arg("add")
.args(["foo", "-p", "bar"])
@ -1680,7 +1673,7 @@ fn overwrite_inherit_noop() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.masquerade_as_nightly_cargo()
.arg("add")
.args(["foo", "-p", "bar"])
@ -1703,7 +1696,7 @@ fn overwrite_inherit_optional_noop() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.masquerade_as_nightly_cargo()
.arg("add")
.args(["foo", "-p", "bar"])
@ -1726,7 +1719,7 @@ fn overwrite_name_dev_noop() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["your-face", "--dev"])
.current_dir(cwd)
@ -1748,7 +1741,7 @@ fn overwrite_name_noop() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["your-face"])
.current_dir(cwd)
@ -1767,7 +1760,7 @@ fn overwrite_no_default_features() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package1", "my-package2@0.4.1", "--no-default-features"])
.current_dir(cwd)
@ -1791,7 +1784,7 @@ fn overwrite_no_default_features_with_default_features() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package1", "my-package2@0.4.1", "--default-features"])
.current_dir(cwd)
@ -1817,7 +1810,7 @@ fn overwrite_no_optional() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package1", "my-package2@0.4.1", "--no-optional"])
.current_dir(cwd)
@ -1840,7 +1833,7 @@ fn overwrite_no_optional_with_optional() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package1", "my-package2@0.4.1", "--optional"])
.current_dir(cwd)
@ -1862,7 +1855,7 @@ fn overwrite_optional() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package1", "my-package2@0.4.1", "--optional"])
.current_dir(cwd)
@ -1882,7 +1875,7 @@ fn overwrite_optional_with_no_optional() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package1", "my-package2@0.4.1", "--no-optional"])
.current_dir(cwd)
@ -1904,7 +1897,7 @@ fn overwrite_path_noop() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["your-face", "--path", "./dependency"])
.current_dir(cwd)
@ -1923,7 +1916,7 @@ fn overwrite_path_with_version() {
let project_root = project.root();
let cwd = project_root.join("primary");
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["cargo-list-test-fixture-dependency@20.0"])
.current_dir(&cwd)
@ -1945,7 +1938,7 @@ fn overwrite_rename_with_no_rename() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["versioned-package"])
.current_dir(cwd)
@ -1967,7 +1960,7 @@ fn overwrite_rename_with_rename() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["versioned-package", "--rename", "a2"])
.current_dir(cwd)
@ -1989,7 +1982,7 @@ fn change_rename_target() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package2", "--rename", "some-package"])
.current_dir(cwd)
@ -2012,7 +2005,7 @@ fn overwrite_rename_with_rename_noop() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["versioned-package", "--rename", "a1"])
.current_dir(cwd)
@ -2043,7 +2036,7 @@ fn overwrite_version_with_git() {
});
let git_url = git_dep.url().to_string();
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["versioned-package", "--git", &git_url])
.current_dir(cwd)
@ -2065,7 +2058,7 @@ fn overwrite_version_with_path() {
let project_root = project.root();
let cwd = project_root.join("primary");
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args([
"cargo-list-test-fixture-dependency",
@ -2091,7 +2084,7 @@ fn overwrite_with_rename() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["versioned-package", "--rename", "renamed"])
.current_dir(cwd)
@ -2113,7 +2106,7 @@ fn overwrite_workspace_dep() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.masquerade_as_nightly_cargo()
.arg("add")
.args(["foo", "--path", "./dependency", "-p", "bar"])
@ -2136,7 +2129,7 @@ fn overwrite_workspace_dep_features() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.masquerade_as_nightly_cargo()
.arg("add")
.args(["foo", "--path", "./dependency", "-p", "bar"])
@ -2159,7 +2152,7 @@ fn preserve_sorted() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["toml"])
.current_dir(cwd)
@ -2178,7 +2171,7 @@ fn preserve_unsorted() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["toml"])
.current_dir(cwd)
@ -2197,7 +2190,7 @@ fn registry() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package1", "my-package2", "--registry", "alternative"])
.current_dir(cwd)
@ -2216,7 +2209,7 @@ fn rename() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package", "--rename", "renamed"])
.current_dir(cwd)
@ -2235,7 +2228,7 @@ fn target() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args([
"my-package1",
@ -2259,7 +2252,7 @@ fn target_cfg() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package1", "my-package2", "--target", "cfg(unix)"])
.current_dir(cwd)
@ -2277,7 +2270,7 @@ fn unknown_inherited_feature() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.masquerade_as_nightly_cargo()
.arg("add")
.args(["foo", "-p", "bar"])
@ -2300,7 +2293,7 @@ fn vers() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package@>=0.1.1"])
.current_dir(cwd)
@ -2319,7 +2312,7 @@ fn workspace_path() {
let project_root = project.root();
let cwd = project_root.join("primary");
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args([
"cargo-list-test-fixture-dependency",
@ -2342,7 +2335,7 @@ fn workspace_path_dev() {
let project_root = project.root();
let cwd = project_root.join("primary");
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args([
"cargo-list-test-fixture-dependency",
@ -2366,7 +2359,7 @@ fn workspace_name() {
let project_root = project.root();
let cwd = project_root.join("primary");
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["cargo-list-test-fixture-dependency"])
.current_dir(&cwd)
@ -2385,7 +2378,7 @@ fn deprecated_default_features() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package"])
.current_dir(&cwd)
@ -2407,7 +2400,7 @@ fn deprecated_section() {
let project_root = project.root();
let cwd = &project_root;
cargo_command()
snapbox::cmd::Command::cargo()
.arg("add")
.args(["my-package"])
.current_dir(&cwd)