Skip to content

Commit 07ba57d

Browse files
committed
Remove unnecessary code for cargo add --public testcases
1 parent 5095356 commit 07ba57d

File tree

22 files changed

+28
-122
lines changed

22 files changed

+28
-122
lines changed

tests/testsuite/cargo_add/no_public/mod.rs

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,14 @@ use cargo_test_support::curr_dir;
77
#[cargo_test]
88
fn case() {
99
cargo_test_support::registry::init();
10-
for name in ["my-package1", "my-package2"] {
11-
for ver in [
12-
"0.1.1+my-package",
13-
"0.2.0+my-package",
14-
"0.2.3+my-package",
15-
"0.4.1+my-package",
16-
"20.0.0+my-package",
17-
"99999.0.0+my-package",
18-
"99999.0.0-alpha.1+my-package",
19-
] {
20-
cargo_test_support::registry::Package::new(name, ver).publish();
21-
}
22-
}
23-
10+
cargo_test_support::registry::Package::new("my-package", "0.1.0").publish();
2411
let project = Project::from_template(curr_dir!().join("in"));
2512
let project_root = project.root();
2613
let cwd = &project_root;
2714

2815
snapbox::cmd::Command::cargo_ui()
2916
.arg("add")
30-
.arg_line("my-package1 my-package2@0.4.1 --no-public")
17+
.arg_line("my-package@0.1.0 --no-public")
3118
.current_dir(cwd)
3219
.masquerade_as_nightly_cargo(&["public-dependency"])
3320
.assert()

tests/testsuite/cargo_add/no_public/out/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ name = "cargo-list-test-fixture"
99
version = "0.0.0"
1010

1111
[dependencies]
12-
my-package1 = "99999.0.0"
13-
my-package2 = "0.4.1"
12+
my-package = "0.1.0"
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
Updating `dummy-registry` index
2-
Adding my-package1 v99999.0.0 to dependencies.
3-
Adding my-package2 v0.4.1 to dependencies.
2+
Adding my-package v0.1.0 to dependencies.

tests/testsuite/cargo_add/overwrite_no_public/in/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ name = "cargo-list-test-fixture"
99
version = "0.0.0"
1010

1111
[dependencies]
12-
my-package1 = "99999.0.0"
13-
my-package2 = "0.4.1"
12+
my-package = "0.1.0"

tests/testsuite/cargo_add/overwrite_no_public/mod.rs

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,14 @@ use cargo_test_support::curr_dir;
77
#[cargo_test]
88
fn case() {
99
cargo_test_support::registry::init();
10-
for name in ["my-package1", "my-package2"] {
11-
for ver in [
12-
"0.1.1+my-package",
13-
"0.2.0+my-package",
14-
"0.2.3+my-package",
15-
"0.4.1+my-package",
16-
"20.0.0+my-package",
17-
"99999.0.0+my-package",
18-
"99999.0.0-alpha.1+my-package",
19-
] {
20-
cargo_test_support::registry::Package::new(name, ver).publish();
21-
}
22-
}
23-
10+
cargo_test_support::registry::Package::new("my-package", "0.1.0").publish();
2411
let project = Project::from_template(curr_dir!().join("in"));
2512
let project_root = project.root();
2613
let cwd = &project_root;
2714

2815
snapbox::cmd::Command::cargo_ui()
2916
.arg("add")
30-
.arg_line("my-package1 my-package2@0.4.1 --no-public")
17+
.arg_line("my-package@0.1.0 --no-public")
3118
.current_dir(cwd)
3219
.masquerade_as_nightly_cargo(&["public-dependency"])
3320
.assert()

tests/testsuite/cargo_add/overwrite_no_public/out/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ name = "cargo-list-test-fixture"
99
version = "0.0.0"
1010

1111
[dependencies]
12-
my-package1 = "99999.0.0"
13-
my-package2 = "0.4.1"
12+
my-package = "0.1.0"
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
Updating `dummy-registry` index
2-
Adding my-package1 v99999.0.0 to dependencies.
3-
Adding my-package2 v0.4.1 to dependencies.
2+
Adding my-package v0.1.0 to dependencies.

tests/testsuite/cargo_add/overwrite_no_public_with_public/in/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ name = "cargo-list-test-fixture"
99
version = "0.0.0"
1010

1111
[dependencies]
12-
my-package1 = { version = "99999.0.0", public = false }
13-
my-package2 = { version = "0.4.1", public = false }
12+
my-package = { version = "0.1.0", public = false }

tests/testsuite/cargo_add/overwrite_no_public_with_public/mod.rs

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,14 @@ use cargo_test_support::curr_dir;
77
#[cargo_test]
88
fn case() {
99
cargo_test_support::registry::init();
10-
for name in ["my-package1", "my-package2"] {
11-
for ver in [
12-
"0.1.1+my-package",
13-
"0.2.0+my-package",
14-
"0.2.3+my-package",
15-
"0.4.1+my-package",
16-
"20.0.0+my-package",
17-
"99999.0.0+my-package",
18-
"99999.0.0-alpha.1+my-package",
19-
] {
20-
cargo_test_support::registry::Package::new(name, ver).publish();
21-
}
22-
}
23-
10+
cargo_test_support::registry::Package::new("my-package", "0.1.0").publish();
2411
let project = Project::from_template(curr_dir!().join("in"));
2512
let project_root = project.root();
2613
let cwd = &project_root;
2714

2815
snapbox::cmd::Command::cargo_ui()
2916
.arg("add")
30-
.arg_line("my-package1 my-package2@0.4.1 --public")
17+
.arg_line("my-package@0.1.0 --public")
3118
.current_dir(cwd)
3219
.masquerade_as_nightly_cargo(&["public-dependency"])
3320
.assert()

tests/testsuite/cargo_add/overwrite_no_public_with_public/out/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ name = "cargo-list-test-fixture"
99
version = "0.0.0"
1010

1111
[dependencies]
12-
my-package1 = { version = "99999.0.0", public = true }
13-
my-package2 = { version = "0.4.1", public = true }
12+
my-package = { version = "0.1.0", public = true }

0 commit comments

Comments
 (0)