From 4b17f7f768f236fefd772ee9bc702f4e35567080 Mon Sep 17 00:00:00 2001 From: Jonas Dohse Date: Wed, 17 Apr 2024 08:40:27 +0200 Subject: [PATCH] Add test case for fuzzy package adding issue #13702 --- .../in/Cargo.toml | 5 +++ .../in/primary/Cargo.toml | 4 +++ .../in/primary/src/lib.rs | 0 .../detect_workspace_inherit_fuzzy/mod.rs | 29 ++++++++++++++++ .../out/Cargo.toml | 5 +++ .../out/primary/Cargo.toml | 7 ++++ .../out/primary/src/lib.rs | 0 .../stderr.term.svg | 34 +++++++++++++++++++ tests/testsuite/cargo_add/mod.rs | 1 + 9 files changed, 85 insertions(+) create mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/in/Cargo.toml create mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/in/primary/Cargo.toml create mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/in/primary/src/lib.rs create mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/mod.rs create mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/out/Cargo.toml create mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/out/primary/Cargo.toml create mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/out/primary/src/lib.rs create mode 100644 tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/stderr.term.svg diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/in/Cargo.toml b/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/in/Cargo.toml new file mode 100644 index 00000000000..44742d9e619 --- /dev/null +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/in/Cargo.toml @@ -0,0 +1,5 @@ +[workspace] +members = ["primary"] + +[workspace.dependencies] +fuzzy_dependency = "1.0.0" diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/in/primary/Cargo.toml b/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/in/primary/Cargo.toml new file mode 100644 index 00000000000..fb520246281 --- /dev/null +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/in/primary/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "bar" +version = "0.0.0" +edition = "2015" diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/in/primary/src/lib.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/in/primary/src/lib.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/mod.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/mod.rs new file mode 100644 index 00000000000..27c061228f9 --- /dev/null +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/mod.rs @@ -0,0 +1,29 @@ +use cargo_test_support::compare::assert_ui; +use cargo_test_support::current_dir; +use cargo_test_support::file; +use cargo_test_support::prelude::*; +use cargo_test_support::registry::Package; +use cargo_test_support::str; +use cargo_test_support::Project; + +#[cargo_test] +fn case() { + cargo_test_support::registry::init(); + + Package::new("fuzzy_dependency", "1.0.0").publish(); + + let project = Project::from_template(current_dir!().join("in")); + let project_root = project.root(); + let cwd = &project_root; + + snapbox::cmd::Command::cargo_ui() + .arg("add") + .args(["fuzzy-dependency", "-p", "bar"]) + .current_dir(cwd) + .assert() + .success() + .stdout_eq(str![""]) + .stderr_eq(file!["stderr.term.svg"]); + + assert_ui().subset_matches(current_dir!().join("out"), &project_root); +} diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/out/Cargo.toml b/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/out/Cargo.toml new file mode 100644 index 00000000000..44742d9e619 --- /dev/null +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/out/Cargo.toml @@ -0,0 +1,5 @@ +[workspace] +members = ["primary"] + +[workspace.dependencies] +fuzzy_dependency = "1.0.0" diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/out/primary/Cargo.toml b/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/out/primary/Cargo.toml new file mode 100644 index 00000000000..1ae5f7b6361 --- /dev/null +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/out/primary/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "bar" +version = "0.0.0" +edition = "2015" + +[dependencies] +fuzzy_dependency = "1.0.0" diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/out/primary/src/lib.rs b/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/out/primary/src/lib.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/stderr.term.svg b/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/stderr.term.svg new file mode 100644 index 00000000000..2530de07194 --- /dev/null +++ b/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/stderr.term.svg @@ -0,0 +1,34 @@ + + + + + + + Updating `dummy-registry` index + + warning: translating `fuzzy-dependency` to `fuzzy_dependency` + + Adding fuzzy_dependency v1.0.0 to dependencies + + Locking 1 package to latest compatible version + + + + + + diff --git a/tests/testsuite/cargo_add/mod.rs b/tests/testsuite/cargo_add/mod.rs index 62feb8422c8..ff96419281b 100644 --- a/tests/testsuite/cargo_add/mod.rs +++ b/tests/testsuite/cargo_add/mod.rs @@ -13,6 +13,7 @@ mod deprecated_default_features; mod deprecated_section; mod detect_workspace_inherit; mod detect_workspace_inherit_features; +mod detect_workspace_inherit_fuzzy; mod detect_workspace_inherit_optional; mod detect_workspace_inherit_public; mod dev;