From 49694145a80e0d5f8c10b7660a77822b93fdec93 Mon Sep 17 00:00:00 2001 From: "Azzam S.A" Date: Wed, 21 Dec 2022 21:24:57 +0700 Subject: [PATCH] fix: change `--file` to `--config` It is more self-describable. --- src/cli.rs | 2 +- tests/integration_test.rs | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/cli.rs b/src/cli.rs index 787877e..9e1f972 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -18,7 +18,7 @@ pub struct Opts { pub rtype: RecordType, /// Specify an alternate configuration file - #[arg(short = 'f', long = "file", default_value_os_t = PathBuf::from("digs.toml"))] + #[arg(short, long, default_value_os_t = PathBuf::from("digs.toml"))] pub config: PathBuf, } diff --git a/tests/integration_test.rs b/tests/integration_test.rs index 4cddaa3..522b3e9 100644 --- a/tests/integration_test.rs +++ b/tests/integration_test.rs @@ -16,7 +16,7 @@ fn help() -> Result<(), Box> { fn default_config_not_found() -> Result<(), Box> { let mut cmd = Command::cargo_bin("digs")?; cmd.arg("example.net") - .arg("-f") + .arg("-c") .arg("file/doesnt/exist/digs.toml"); cmd.assert() .failure() @@ -27,7 +27,7 @@ fn default_config_not_found() -> Result<(), Box> { #[test] fn config_not_found() -> Result<(), Box> { let mut cmd = Command::cargo_bin("digs")?; - cmd.arg("example.net").arg("-f").arg("file/doesnt/exist"); + cmd.arg("example.net").arg("-c").arg("file/doesnt/exist"); cmd.assert() .failure() .stderr(predicate::str::contains("Configuration file is not found")); @@ -38,7 +38,7 @@ fn config_not_found() -> Result<(), Box> { fn config_invalid() -> Result<(), Box> { let mut cmd = Command::cargo_bin("digs")?; cmd.arg("example.net") - .arg("-f") + .arg("-c") .arg("tests/fixture/invalid.toml"); cmd.assert().failure().stderr(predicate::str::contains( "Invalid configuration: missing field `name`", @@ -51,7 +51,7 @@ fn rtype_invalid() -> Result<(), Box> { let mut cmd = Command::cargo_bin("digs")?; cmd.arg("example.net") .arg("FOO") - .arg("-f") + .arg("-c") .arg("tests/fixture/digs.toml"); cmd.assert().failure().stderr(predicate::str::contains( r#"'FOO' isn't a valid value for '[RTYPE]'"#, @@ -65,7 +65,7 @@ fn rtype_too_many() -> Result<(), Box> { cmd.arg("example.net") .arg("A") .arg("MX") - .arg("-f") + .arg("-c") .arg("tests/fixture/digs.toml"); cmd.assert().failure().stderr(predicate::str::contains( "Found argument 'MX' which wasn't expected", @@ -77,7 +77,7 @@ fn rtype_too_many() -> Result<(), Box> { fn address_invalid() -> Result<(), Box> { let mut cmd = Command::cargo_bin("digs")?; cmd.arg("example.net") - .arg("-f") + .arg("-c") .arg("tests/fixture/invalid-address.toml"); cmd.assert() .success() @@ -100,7 +100,7 @@ fn query() -> Result<(), Box> { let mut cmd = Command::cargo_bin("digs")?; cmd.arg("example.net") .arg("A") - .arg("-f") + .arg("-c") .arg("tests/fixture/digs.toml"); cmd.assert() .success() @@ -113,7 +113,7 @@ fn query() -> Result<(), Box> { fn query_without_rtype() -> Result<(), Box> { let mut cmd = Command::cargo_bin("digs")?; cmd.arg("example.net") - .arg("-f") + .arg("-c") .arg("tests/fixture/digs.toml"); cmd.assert() .success()