Skip to content

Commit d35cb17

Browse files
committed
Optimize the tests, use in/ to generate templates
1 parent 5cc09ea commit d35cb17

File tree

10 files changed

+26
-57
lines changed

10 files changed

+26
-57
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[source.crates-io]
2+
replace-with = "vendored-sources"
3+
4+
[source.vendored-sources]
5+
directory = "./vendor"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"files":{}}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[workspace]
2+
3+
[package]
4+
name = "aa"
5+
version = "0.0.0"

tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/in/vendor/aa/src/lib.rs

Whitespace-only changes.

tests/testsuite/cargo_add/add_no_vendored_package_with_alter_registry/mod.rs

+2-23
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use cargo_test_support::compare::assert_ui;
2-
use cargo_test_support::paths;
32
use cargo_test_support::prelude::*;
4-
use cargo_test_support::ProjectBuilder;
3+
use cargo_test_support::Project;
54

65
use cargo_test_support::curr_dir;
76

@@ -19,27 +18,7 @@ fn case() {
1918
.alternative(true)
2019
.publish();
2120

22-
let project = ProjectBuilder::new(paths::root().join("in"))
23-
.file(
24-
".cargo/config.toml",
25-
r#"[source.crates-io]
26-
replace-with = "vendored-sources"
27-
28-
[source.vendored-sources]
29-
directory = "./vendor"
30-
"#,
31-
)
32-
.file("src/lib.rs", "")
33-
.file(
34-
"Cargo.toml",
35-
r#"[workspace]
36-
37-
[package]
38-
name = "cargo-list-test-fixture"
39-
version = "0.0.0"
40-
"#,
41-
)
42-
.build();
21+
let project = Project::from_template(curr_dir!().join("in"));
4322
let project_root = project.root();
4423
let cwd = &project_root;
4524

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[source.crates-io]
2+
replace-with = "vendored-sources"
3+
4+
[source.vendored-sources]
5+
directory = "./vendor"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"files":{}}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[workspace]
2+
3+
[package]
4+
name = "aa"
5+
version = "0.0.0"

tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/in/vendor/aa/src/lib.rs

Whitespace-only changes.

tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/mod.rs

+2-34
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,12 @@
11
use cargo_test_support::compare::assert_ui;
2-
use cargo_test_support::paths;
32
use cargo_test_support::prelude::*;
4-
use cargo_test_support::ProjectBuilder;
3+
use cargo_test_support::Project;
54

65
use cargo_test_support::curr_dir;
76

87
#[cargo_test]
98
fn case() {
10-
let project = ProjectBuilder::new(paths::root().join("in"))
11-
.file(
12-
".cargo/config.toml",
13-
r#"[source.crates-io]
14-
replace-with = "vendored-sources"
15-
16-
[source.vendored-sources]
17-
directory = "./vendor"
18-
"#,
19-
)
20-
.file("vendor/aa/src/lib.rs", "")
21-
.file("vendor/aa/.cargo-checksum.json", "{\"files\":{}}")
22-
.file(
23-
"vendor/aa/Cargo.toml",
24-
r#"[workspace]
25-
26-
[package]
27-
name = "aa"
28-
version = "0.0.0"
29-
"#,
30-
)
31-
.file("src/lib.rs", "")
32-
.file(
33-
"Cargo.toml",
34-
r#"[workspace]
35-
36-
[package]
37-
name = "cargo-list-test-fixture"
38-
version = "0.0.0"
39-
"#,
40-
)
41-
.build();
9+
let project = Project::from_template(curr_dir!().join("in"));
4210
let project_root = project.root();
4311
let cwd = &project_root;
4412

0 commit comments

Comments
 (0)