Skip to content

Commit

Permalink
test(add): Make test data valid
Browse files Browse the repository at this point in the history 
Resolving the manifests will fail due to inconsistencies.  This
addresses those.
  • Loading branch information
@epage @Hezuikn
epage authored and Hezuikn committed Sep 22, 2022
1 parent 1faccdf commit f737784
Show file tree
Hide file tree
Showing 20 changed files with 50 additions and 29 deletions.
4 changes: 4 additions & 0 deletions tests/testsuite/cargo_add/build_prefer_existing_version/in/dependency/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@
[package]
name = "cargo-list-test-fixture-dependency"
version = "0.0.0"

[features]
one = []
two = []
4 changes: 4 additions & 0 deletions tests/testsuite/cargo_add/build_prefer_existing_version/out/dependency/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@
[package]
name = "cargo-list-test-fixture-dependency"
version = "0.0.0"

[features]
one = []
two = []
3 changes: 3 additions & 0 deletions tests/testsuite/cargo_add/build_prefer_existing_version/stderr.log
View file
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
Adding cargo-list-test-fixture-dependency (local) to build-dependencies.
Features:
- one
- two
4 changes: 4 additions & 0 deletions tests/testsuite/cargo_add/dev_prefer_existing_version/in/dependency/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@
[package]
name = "cargo-list-test-fixture-dependency"
version = "0.0.0"

[features]
one = []
two = []
4 changes: 4 additions & 0 deletions tests/testsuite/cargo_add/dev_prefer_existing_version/out/dependency/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@
[package]
name = "cargo-list-test-fixture-dependency"
version = "0.0.0"

[features]
one = []
two = []
3 changes: 3 additions & 0 deletions tests/testsuite/cargo_add/dev_prefer_existing_version/stderr.log
View file
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
Adding cargo-list-test-fixture-dependency (local) to dev-dependencies.
Features:
- one
- two
3 changes: 1 addition & 2 deletions tests/testsuite/cargo_add/list_features_path/in/dependency/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name = "your-face"
version = "0.1.3"

[dependencies]
toml_edit = "0.1.5"
atty = "0.2.13"
my-package = "0.1.1"
optional-dependency = { path = "../optional", optional = true }

[features]
Expand Down
5 changes: 2 additions & 3 deletions tests/testsuite/cargo_add/list_features_path/in/optional/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[package]
name = "optional-dep"
name = "optional-dependency"
version = "0.1.3"

[dependencies]
toml_edit = "0.1.5"
atty = "0.2.13"
my-package = "0.1.1"
3 changes: 1 addition & 2 deletions tests/testsuite/cargo_add/list_features_path/out/dependency/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name = "your-face"
version = "0.1.3"

[dependencies]
toml_edit = "0.1.5"
atty = "0.2.13"
my-package = "0.1.1"
optional-dependency = { path = "../optional", optional = true }

[features]
Expand Down
3 changes: 1 addition & 2 deletions tests/testsuite/cargo_add/list_features_path_no_default/in/dependency/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name = "your-face"
version = "0.1.3"

[dependencies]
toml_edit = "0.1.5"
atty = "0.2.13"
my-package = "0.1.1"
optional-dependency = { path = "../optional", optional = true }

[features]
Expand Down
5 changes: 2 additions & 3 deletions tests/testsuite/cargo_add/list_features_path_no_default/in/optional/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[package]
name = "optional-dep"
name = "optional-dependency"
version = "0.1.3"

[dependencies]
toml_edit = "0.1.5"
atty = "0.2.13"
my-package = "0.1.1"
3 changes: 1 addition & 2 deletions tests/testsuite/cargo_add/list_features_path_no_default/out/dependency/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name = "your-face"
version = "0.1.3"

[dependencies]
toml_edit = "0.1.5"
atty = "0.2.13"
my-package = "0.1.1"
optional-dependency = { path = "../optional", optional = true }

[features]
Expand Down
6 changes: 3 additions & 3 deletions tests/testsuite/cargo_add/overwrite_optional_with_no_optional/in/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ name = "cargo-list-test-fixture"
version = "0.0.0"

[features]
default = ["my-package1"]
other = ["my-package1/nose"]
default = ["your-face"]
other = ["your-face/nose"]

[dependencies]
my-package1 = { version = "99999.0.0", optional = true }
your-face = { version = "99999.0.0", optional = true }
my-package2 = { version = "0.4.1", optional = true }
2 changes: 1 addition & 1 deletion tests/testsuite/cargo_add/overwrite_optional_with_no_optional/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fn overwrite_optional_with_no_optional() {

snapbox::cmd::Command::cargo_ui()
.arg("add")
.arg_line("my-package1 [email protected] --no-optional")
.arg_line("your-face [email protected] --no-optional")
.current_dir(cwd)
.assert()
.success()
Expand Down
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_add/overwrite_optional_with_no_optional/out/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ version = "0.0.0"

[features]
default = []
other = ["my-package1/nose"]
other = ["your-face/nose"]

[dependencies]
my-package1 = { version = "99999.0.0" }
your-face = { version = "99999.0.0" }
my-package2 = { version = "0.4.1" }
7 changes: 6 additions & 1 deletion tests/testsuite/cargo_add/overwrite_optional_with_no_optional/stderr.log
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Updating `dummy-registry` index
Adding my-package1 v99999.0.0 to dependencies.
Adding your-face v99999.0.0 to dependencies.
Features:
- ears
- eyes
- mouth
- nose
Adding my-package2 v0.4.1 to dependencies.
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_add/preserve_sorted/in/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ name = "cargo-list-test-fixture"
version = "0.0.0"

[dependencies]
atty = "0.2.13"
toml_edit = "0.1.5"
my-package = "0.1.1"
versioned-package = "0.1.1"
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_add/preserve_sorted/out/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ name = "cargo-list-test-fixture"
version = "0.0.0"

[dependencies]
atty = "0.2.13"
my-package = "0.1.1"
toml = "99999.0.0"
toml_edit = "0.1.5"
versioned-package = "0.1.1"
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_add/preserve_unsorted/in/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ name = "cargo-list-test-fixture"
version = "0.0.0"

[dependencies]
toml_edit = "0.1.5"
atty = "0.2.13"
versioned-package = "0.1.1"
my-package = "0.1.1"
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_add/preserve_unsorted/out/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ name = "cargo-list-test-fixture"
version = "0.0.0"

[dependencies]
toml_edit = "0.1.5"
atty = "0.2.13"
versioned-package = "0.1.1"
my-package = "0.1.1"
toml = "99999.0.0"

0 comments on commit f737784

Please sign in to comment.