diff --git a/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.in/Cargo.toml b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.in/Cargo.toml new file mode 100644 index 0000000000..02dc75c19e --- /dev/null +++ b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.in/Cargo.toml @@ -0,0 +1,22 @@ +[package] +name = "outer-member" +version = "0.1.0" +edition = "2021" + +[dependencies] +second-member.workspace = true +third-member = { version = "0.1.0", path = "./third-member" } + +[workspace.package] +version = "0.1.0" + +[workspace.dependencies] +second-member = { version = "0.1.0", path = "./second-member" } +third-member = { version = "0.1.0", path = "./third-member" } + +[workspace] +members = [ + "second-member", + "third-member", + "." +] \ No newline at end of file diff --git a/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.in/second-member/Cargo.toml b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.in/second-member/Cargo.toml new file mode 100644 index 0000000000..bc7ee0a6f2 --- /dev/null +++ b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.in/second-member/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "second-member" +version.workspace = true +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] diff --git a/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.in/second-member/src/lib.rs b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.in/second-member/src/lib.rs new file mode 100644 index 0000000000..7d12d9af81 --- /dev/null +++ b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.in/second-member/src/lib.rs @@ -0,0 +1,14 @@ +pub fn add(left: usize, right: usize) -> usize { + left + right +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn it_works() { + let result = add(2, 2); + assert_eq!(result, 4); + } +} diff --git a/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.in/src/main.rs b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.in/src/main.rs new file mode 100644 index 0000000000..e7a11a969c --- /dev/null +++ b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.in/src/main.rs @@ -0,0 +1,3 @@ +fn main() { + println!("Hello, world!"); +} diff --git a/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.in/third-member/Cargo.toml b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.in/third-member/Cargo.toml new file mode 100644 index 0000000000..0bacb9229a --- /dev/null +++ b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.in/third-member/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "third-member" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] diff --git a/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.in/third-member/src/lib.rs b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.in/third-member/src/lib.rs new file mode 100644 index 0000000000..7d12d9af81 --- /dev/null +++ b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.in/third-member/src/lib.rs @@ -0,0 +1,14 @@ +pub fn add(left: usize, right: usize) -> usize { + left + right +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn it_works() { + let result = add(2, 2); + assert_eq!(result, 4); + } +} diff --git a/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.out/Cargo.toml b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.out/Cargo.toml new file mode 100644 index 0000000000..60cc6dcd2f --- /dev/null +++ b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.out/Cargo.toml @@ -0,0 +1,22 @@ +[package] +name = "outer-member" +version = "0.1.0" +edition = "2021" + +[dependencies] +second-member.workspace = true +third-member = { version = "0.1.0", path = "./third-member" } + +[workspace.package] +version = "2.0.0" + +[workspace.dependencies] +second-member = { version = "2.0.0", path = "./second-member" } +third-member = { version = "0.1.0", path = "./third-member" } + +[workspace] +members = [ + "second-member", + "third-member", + "." +] diff --git a/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.out/second-member/Cargo.toml b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.out/second-member/Cargo.toml new file mode 100644 index 0000000000..bc7ee0a6f2 --- /dev/null +++ b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.out/second-member/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "second-member" +version.workspace = true +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] diff --git a/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.out/second-member/src/lib.rs b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.out/second-member/src/lib.rs new file mode 100644 index 0000000000..7d12d9af81 --- /dev/null +++ b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.out/second-member/src/lib.rs @@ -0,0 +1,14 @@ +pub fn add(left: usize, right: usize) -> usize { + left + right +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn it_works() { + let result = add(2, 2); + assert_eq!(result, 4); + } +} diff --git a/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.out/src/main.rs b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.out/src/main.rs new file mode 100644 index 0000000000..e7a11a969c --- /dev/null +++ b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.out/src/main.rs @@ -0,0 +1,3 @@ +fn main() { + println!("Hello, world!"); +} diff --git a/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.out/third-member/Cargo.toml b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.out/third-member/Cargo.toml new file mode 100644 index 0000000000..0bacb9229a --- /dev/null +++ b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.out/third-member/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "third-member" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] diff --git a/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.out/third-member/src/lib.rs b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.out/third-member/src/lib.rs new file mode 100644 index 0000000000..7d12d9af81 --- /dev/null +++ b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.out/third-member/src/lib.rs @@ -0,0 +1,14 @@ +pub fn add(left: usize, right: usize) -> usize { + left + right +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn it_works() { + let result = add(2, 2); + assert_eq!(result, 4); + } +} diff --git a/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.toml b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.toml new file mode 100644 index 0000000000..388f741de7 --- /dev/null +++ b/tests/cmd/set-version/workspace-dependencies-in-normal-manifest.toml @@ -0,0 +1,12 @@ +bin.name = "cargo-set-version" +args = ["set-version", "--package", "second-member", "2.0.0"] +status = "success" +stdout = "" +stderr = """ + Upgraded workspace-wide version from 0.1.0 to 2.0.0 +Updated dependency in workspace dependencies from 0.1.0 to 2.0.0 +""" +fs.sandbox = true + +[env.add] +CARGO_IS_TEST="1"