Skip to content

Commit ef59b76

Browse files
martinemdemartinemde
committed
Update assert_cmd and fix deprecation warnings
1 parent 6094037 commit ef59b76

18 files changed

+86
-98
lines changed

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fnmatch-regex2 = "0.3.0"
5050
strip-ansi-escapes = "0.2.0"
5151

5252
[dev-dependencies]
53-
assert_cmd = "2.0.10" # testing CLI
53+
assert_cmd = "2.1.1" # testing CLI
5454
rusty-hook = "^0.11.2" # git hooks
5555
predicates = "3.0.2" # kind of like rspec assertions
5656
pretty_assertions = "1.3.0" # Shows a more readable diff when comparing objects

‎tests/add_constant_dependencies.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use assert_cmd::Command;
1+
use assert_cmd::cargo::cargo_bin_cmd;
22
use predicates::prelude::*;
33
use pretty_assertions::assert_eq;
44
use serial_test::serial;
@@ -9,7 +9,7 @@ mod common;
99
#[test]
1010
#[serial]
1111
fn test_add_constant_dependencies() -> anyhow::Result<()> {
12-
Command::cargo_bin("pks")?
12+
cargo_bin_cmd!("pks")
1313
.arg("--project-root")
1414
.arg("tests/fixtures/app_with_missing_dependencies")
1515
.arg("update-dependencies-for-constant")
@@ -43,7 +43,7 @@ fn test_add_constant_dependencies() -> anyhow::Result<()> {
4343
#[test]
4444
#[serial]
4545
fn test_add_constant_dependencies_no_dependencies() -> anyhow::Result<()> {
46-
Command::cargo_bin("pks")?
46+
cargo_bin_cmd!("pks")
4747
.arg("--project-root")
4848
.arg("tests/fixtures/app_with_missing_dependencies")
4949
.arg("update-dependencies-for-constant")

‎tests/add_dependency_test.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use assert_cmd::Command;
1+
use assert_cmd::cargo::cargo_bin_cmd;
22
use predicates::prelude::*;
33
use pretty_assertions::assert_eq;
44
use serial_test::serial;
@@ -9,7 +9,7 @@ mod common;
99
#[test]
1010
#[serial]
1111
fn test_add_dependency() -> Result<(), Box<dyn Error>> {
12-
Command::cargo_bin("pks")?
12+
cargo_bin_cmd!("pks")
1313
.arg("--project-root")
1414
.arg("tests/fixtures/app_with_missing_dependency")
1515
.arg("add-dependency")
@@ -41,7 +41,7 @@ fn test_add_dependency() -> Result<(), Box<dyn Error>> {
4141
#[test]
4242
#[serial]
4343
fn test_add_dependency_creating_cycle() -> Result<(), Box<dyn Error>> {
44-
Command::cargo_bin("pks")?
44+
cargo_bin_cmd!("pks")
4545
.arg("--project-root")
4646
.arg("tests/fixtures/app_with_missing_dependency")
4747
.arg("add-dependency")
@@ -80,7 +80,7 @@ fn test_add_dependency_creating_cycle() -> Result<(), Box<dyn Error>> {
8080

8181
#[test]
8282
fn test_add_dependency_unnecessarily() -> Result<(), Box<dyn Error>> {
83-
Command::cargo_bin("pks")?
83+
cargo_bin_cmd!("pks")
8484
.arg("--project-root")
8585
.arg("tests/fixtures/app_with_missing_dependency")
8686
.arg("add-dependency")

‎tests/check_test.rs‎

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use assert_cmd::Command;
1+
use assert_cmd::cargo::cargo_bin_cmd;
22
use predicates::prelude::*;
33
use std::{error::Error, fs};
44

@@ -11,7 +11,7 @@ pub fn stripped_output(output: Vec<u8>) -> String {
1111
#[test]
1212
fn test_check_with_privacy_dependency_error_template_overrides(
1313
) -> Result<(), Box<dyn Error>> {
14-
let output = Command::cargo_bin("pks")?
14+
let output = cargo_bin_cmd!("pks")
1515
.arg("--project-root")
1616
.arg("tests/fixtures/privacy_violation_overrides")
1717
.arg("--debug")
@@ -33,7 +33,7 @@ fn test_check_with_privacy_dependency_error_template_overrides(
3333
}
3434
#[test]
3535
fn test_check() -> Result<(), Box<dyn Error>> {
36-
let output = Command::cargo_bin("pks")?
36+
let output = cargo_bin_cmd!("pks")
3737
.arg("--project-root")
3838
.arg("tests/fixtures/simple_app")
3939
.arg("--debug")
@@ -56,7 +56,7 @@ fn test_check() -> Result<(), Box<dyn Error>> {
5656

5757
#[test]
5858
fn test_check_enforce_privacy_disabled() -> Result<(), Box<dyn Error>> {
59-
let output = Command::cargo_bin("pks")?
59+
let output = cargo_bin_cmd!("pks")
6060
.arg("--project-root")
6161
.arg("tests/fixtures/simple_app")
6262
.arg("--debug")
@@ -79,7 +79,7 @@ fn test_check_enforce_privacy_disabled() -> Result<(), Box<dyn Error>> {
7979

8080
#[test]
8181
fn test_check_enforce_dependency_disabled() -> Result<(), Box<dyn Error>> {
82-
let output = Command::cargo_bin("pks")?
82+
let output = cargo_bin_cmd!("pks")
8383
.arg("--project-root")
8484
.arg("tests/fixtures/simple_app")
8585
.arg("--debug")
@@ -102,7 +102,7 @@ fn test_check_enforce_dependency_disabled() -> Result<(), Box<dyn Error>> {
102102

103103
#[test]
104104
fn test_check_with_single_file() -> Result<(), Box<dyn Error>> {
105-
let output = Command::cargo_bin("pks")?
105+
let output = cargo_bin_cmd!("pks")
106106
.arg("--project-root")
107107
.arg("tests/fixtures/simple_app")
108108
.arg("--debug")
@@ -127,7 +127,7 @@ fn test_check_with_single_file() -> Result<(), Box<dyn Error>> {
127127
#[test]
128128
fn test_check_with_single_file_experimental_parser(
129129
) -> Result<(), Box<dyn Error>> {
130-
let output = Command::cargo_bin("pks")?
130+
let output = cargo_bin_cmd!("pks")
131131
.arg("--project-root")
132132
.arg("tests/fixtures/simple_app")
133133
.arg("--debug")
@@ -152,7 +152,7 @@ fn test_check_with_single_file_experimental_parser(
152152

153153
#[test]
154154
fn test_check_with_package_todo_file() -> Result<(), Box<dyn Error>> {
155-
Command::cargo_bin("pks")?
155+
cargo_bin_cmd!("pks")
156156
.arg("--project-root")
157157
.arg("tests/fixtures/contains_package_todo")
158158
.arg("--debug")
@@ -168,7 +168,7 @@ fn test_check_with_package_todo_file() -> Result<(), Box<dyn Error>> {
168168

169169
#[test]
170170
fn test_check_with_package_todo_file_csv() -> Result<(), Box<dyn Error>> {
171-
Command::cargo_bin("pks")?
171+
cargo_bin_cmd!("pks")
172172
.arg("--project-root")
173173
.arg("tests/fixtures/contains_package_todo")
174174
.arg("--debug")
@@ -188,7 +188,7 @@ fn test_check_with_package_todo_file_csv() -> Result<(), Box<dyn Error>> {
188188
#[test]
189189
fn test_check_with_package_todo_file_ignoring_recorded_violations(
190190
) -> Result<(), Box<dyn Error>> {
191-
let output = Command::cargo_bin("pks")?
191+
let output = cargo_bin_cmd!("pks")
192192
.arg("--project-root")
193193
.arg("tests/fixtures/contains_package_todo")
194194
.arg("--debug")
@@ -212,8 +212,7 @@ fn test_check_with_package_todo_file_ignoring_recorded_violations(
212212

213213
#[test]
214214
fn test_check_with_experimental_parser() -> Result<(), Box<dyn Error>> {
215-
let output = Command::cargo_bin("pks")
216-
.unwrap()
215+
let output = cargo_bin_cmd!("pks")
217216
.arg("--project-root")
218217
.arg("tests/fixtures/simple_app")
219218
.arg("--experimental-parser")
@@ -237,8 +236,7 @@ fn test_check_with_experimental_parser() -> Result<(), Box<dyn Error>> {
237236

238237
#[test]
239238
fn test_check_with_stale_violations() -> Result<(), Box<dyn Error>> {
240-
Command::cargo_bin("pks")
241-
.unwrap()
239+
cargo_bin_cmd!("pks")
242240
.arg("--project-root")
243241
.arg("tests/fixtures/contains_stale_violations")
244242
.arg("check")
@@ -255,8 +253,7 @@ fn test_check_with_stale_violations() -> Result<(), Box<dyn Error>> {
255253
#[test]
256254
fn test_check_with_stale_violations_when_file_no_longer_exists(
257255
) -> Result<(), Box<dyn Error>> {
258-
Command::cargo_bin("pks")
259-
.unwrap()
256+
cargo_bin_cmd!("pks")
260257
.arg("--project-root")
261258
.arg("tests/fixtures/contains_stale_violations_no_file")
262259
.arg("check")
@@ -272,8 +269,7 @@ fn test_check_with_stale_violations_when_file_no_longer_exists(
272269

273270
#[test]
274271
fn test_check_with_relationship_violations() -> Result<(), Box<dyn Error>> {
275-
Command::cargo_bin("pks")
276-
.unwrap()
272+
cargo_bin_cmd!("pks")
277273
.arg("--project-root")
278274
.arg("tests/fixtures/app_with_rails_relationships")
279275
.arg("check")
@@ -289,8 +285,7 @@ fn test_check_with_relationship_violations() -> Result<(), Box<dyn Error>> {
289285

290286
#[test]
291287
fn test_check_without_stale_violations() -> Result<(), Box<dyn Error>> {
292-
Command::cargo_bin("pks")
293-
.unwrap()
288+
cargo_bin_cmd!("pks")
294289
.arg("--project-root")
295290
.arg("tests/fixtures/contains_package_todo")
296291
.arg("check")
@@ -309,8 +304,7 @@ fn test_check_without_stale_violations() -> Result<(), Box<dyn Error>> {
309304

310305
#[test]
311306
fn test_check_with_strict_mode() -> Result<(), Box<dyn Error>> {
312-
Command::cargo_bin("pks")
313-
.unwrap()
307+
cargo_bin_cmd!("pks")
314308
.arg("--project-root")
315309
.arg("tests/fixtures/uses_strict_mode")
316310
.arg("check")
@@ -329,8 +323,7 @@ fn test_check_with_strict_mode() -> Result<(), Box<dyn Error>> {
329323

330324
#[test]
331325
fn test_check_with_strict_mode_output_csv() -> Result<(), Box<dyn Error>> {
332-
Command::cargo_bin("pks")
333-
.unwrap()
326+
cargo_bin_cmd!("pks")
334327
.arg("--project-root")
335328
.arg("tests/fixtures/uses_strict_mode")
336329
.arg("check")
@@ -354,7 +347,7 @@ fn test_check_contents() -> Result<(), Box<dyn Error>> {
354347
let foo_rb_contents =
355348
fs::read_to_string(format!("{}/{}", project_root, relative_path))?;
356349

357-
let output = Command::cargo_bin("pks")?
350+
let output = cargo_bin_cmd!("pks")
358351
.arg("--project-root")
359352
.arg(project_root)
360353
.arg("--debug")
@@ -385,7 +378,7 @@ fn test_check_contents_ignoring_recorded_violations(
385378
let foo_rb_contents =
386379
fs::read_to_string(format!("{}/{}", project_root, relative_path))?;
387380

388-
let output = Command::cargo_bin("pks")?
381+
let output = cargo_bin_cmd!("pks")
389382
.arg("--project-root")
390383
.arg(project_root)
391384
.arg("--debug")

‎tests/check_unused_dependencies.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
use assert_cmd::prelude::*;
1+
use assert_cmd::cargo::cargo_bin_cmd;
22
use predicates::prelude::*;
3-
use std::{error::Error, fs, process::Command};
3+
use std::{error::Error, fs};
44
mod common;
55

66
fn assert_check_unused_dependencies(cmd: &str) -> Result<(), Box<dyn Error>> {
7-
Command::cargo_bin("pks")?
7+
cargo_bin_cmd!("pks")
88
.arg("--project-root")
99
.arg("tests/fixtures/app_with_dependency_cycles")
1010
.arg("--debug")
@@ -51,7 +51,7 @@ fn assert_auto_correct_unused_dependencies(
5151
let foo_package_yml = fs::read_to_string("tests/fixtures/app_with_unnecessary_dependencies/packs/foo/package.yml").unwrap();
5252
assert_eq!(foo_package_yml, expected_before_autocorrect);
5353

54-
Command::cargo_bin("pks")?
54+
cargo_bin_cmd!("pks")
5555
.arg("--project-root")
5656
.arg("tests/fixtures/app_with_unnecessary_dependencies")
5757
.arg("--debug")
@@ -94,7 +94,7 @@ fn test_auto_correct_unnecessary_dependencies() -> Result<(), Box<dyn Error>> {
9494
#[test]
9595
fn test_check_unnecessary_dependencies_no_issue() -> Result<(), Box<dyn Error>>
9696
{
97-
Command::cargo_bin("pks")?
97+
cargo_bin_cmd!("pks")
9898
.arg("--project-root")
9999
.arg("tests/fixtures/simple_app")
100100
.arg("--debug")

‎tests/corrupt_todo_test.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
use assert_cmd::Command;
1+
use assert_cmd::cargo::cargo_bin_cmd;
22
use predicates::prelude::*;
33
mod common;
44

55
#[test]
66
fn test_check_with_corrupt_todo() -> anyhow::Result<()> {
7-
Command::cargo_bin("pks")?
7+
cargo_bin_cmd!("pks")
88
.arg("--project-root")
99
.arg("tests/fixtures/contains_corrupt_todo")
1010
.arg("--debug")

‎tests/create_test.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use assert_cmd::Command;
1+
use assert_cmd::cargo::cargo_bin_cmd;
22
use predicates::prelude::*;
33
use pretty_assertions::assert_eq;
44
use std::{error::Error, fs, path::Path};
@@ -9,7 +9,7 @@ mod common;
99
fn test_create() -> Result<(), Box<dyn Error>> {
1010
common::delete_foobar();
1111

12-
Command::cargo_bin("pks")?
12+
cargo_bin_cmd!("pks")
1313
.arg("--project-root")
1414
.arg("tests/fixtures/simple_app")
1515
.arg("create")
@@ -76,7 +76,7 @@ fn test_create_with_readme_template_default_path() -> Result<(), Box<dyn Error>>
7676
"This is a test custom README template",
7777
)?;
7878

79-
Command::cargo_bin("pks")?
79+
cargo_bin_cmd!("pks")
8080
.arg("--project-root")
8181
.arg("tests/fixtures/simple_packs_first_app")
8282
.arg("create")
@@ -106,7 +106,7 @@ fn test_create_with_readme_template_custom_path() -> Result<(), Box<dyn Error>>
106106
{
107107
common::delete_foobar_app_with_custom_readme();
108108

109-
Command::cargo_bin("pks")?
109+
cargo_bin_cmd!("pks")
110110
.arg("--project-root")
111111
.arg("tests/fixtures/app_with_custom_readme")
112112
.arg("create")
@@ -131,7 +131,7 @@ fn test_create_with_readme_template_custom_path() -> Result<(), Box<dyn Error>>
131131

132132
#[test]
133133
fn test_create_already_exists() -> Result<(), Box<dyn Error>> {
134-
Command::cargo_bin("pks")?
134+
cargo_bin_cmd!("pks")
135135
.arg("--project-root")
136136
.arg("tests/fixtures/simple_packs_first_app")
137137
.arg("create")

‎tests/delete_cache_test.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use assert_cmd::prelude::*;
2-
use std::{error::Error, fs, path::PathBuf, process::Command};
1+
use assert_cmd::cargo::cargo_bin_cmd;
2+
use std::{error::Error, fs, path::PathBuf};
33
mod common;
44

55
fn is_tmp_cache_packwerk_empty() -> Result<bool, std::io::Error> {
@@ -34,7 +34,7 @@ fn test_delete_cache() -> Result<(), Box<dyn Error>> {
3434

3535
assert!(!is_tmp_cache_packwerk_empty().unwrap());
3636

37-
Command::cargo_bin("pks")?
37+
cargo_bin_cmd!("pks")
3838
.arg("--debug")
3939
.arg("--project-root")
4040
.arg("tests/fixtures/simple_app")

‎tests/dependencies_test.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
use assert_cmd::prelude::*;
1+
use assert_cmd::cargo::cargo_bin_cmd;
22
use predicates::prelude::*;
3-
use std::{error::Error, process::Command};
3+
use std::error::Error;
44

55
mod common;
66

77
#[test]
88
fn test_list_pack_dependencies_with_explicit_dependencies(
99
) -> Result<(), Box<dyn Error>> {
10-
Command::cargo_bin("pks")?
10+
cargo_bin_cmd!("pks")
1111
.arg("--project-root")
1212
.arg("tests/fixtures/simple_app")
1313
.arg("--debug")
@@ -25,7 +25,7 @@ fn test_list_pack_dependencies_with_explicit_dependencies(
2525
#[test]
2626
fn list_pack_dependencies_with_implicit_dependencies(
2727
) -> Result<(), Box<dyn Error>> {
28-
Command::cargo_bin("pks")?
28+
cargo_bin_cmd!("pks")
2929
.arg("--project-root")
3030
.arg("tests/fixtures/contains_package_todo")
3131
.arg("--debug")

‎tests/enforcement_globs.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1+
use assert_cmd::cargo::cargo_bin_cmd;
12
use std::error::Error;
23

3-
use assert_cmd::Command;
4-
54
mod common;
65

76
#[test]
87
fn test_check() -> Result<(), Box<dyn Error>> {
9-
Command::cargo_bin("pks")?
8+
cargo_bin_cmd!("pks")
109
.arg("--project-root")
1110
.arg("tests/fixtures/simple_app_with_enforcement_globs")
1211
.arg("--debug")

0 commit comments

Comments
 (0)