mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: Rename "program" to "command"

This commit is contained in:
Alexis Sellier 2023-02-07 10:16:18 +01:00
parent c861244ab8
commit 7d588fc7ab
No known key found for this signature in database
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
radicle-cli/tests/framework/mod.rs
View File

@ -30,9 +30,9 @@ pub struct Test {
/// An assertion is a command to run with an expected output. /// An assertion is a command to run with an expected output.
#[derive(Debug, PartialEq, Eq)] #[derive(Debug, PartialEq, Eq)]
pub struct Assertion { pub struct Assertion {
/// Name of program to run, eg. `git`. /// Name of command to run, eg. `git`.
program: String, command: String,
/// Program arguments, eg. `["push"]`. /// Command arguments, eg. `["push"]`.
args: Vec<String>, args: Vec<String>,
/// Expected output (stdout or stderr). /// Expected output (stdout or stderr).
expected: String, expected: String,
@ -106,10 +106,10 @@ impl TestFormula {
if let Some(line) = line.strip_prefix('$') { if let Some(line) = line.strip_prefix('$') {
let line = line.trim(); let line = line.trim();
let parts = shlex::split(line).ok_or(Error::Parse)?; let parts = shlex::split(line).ok_or(Error::Parse)?;
let (program, args) = parts.split_first().ok_or(Error::Parse)?; let (cmd, args) = parts.split_first().ok_or(Error::Parse)?;
test.assertions.push(Assertion { test.assertions.push(Assertion {
program: program.to_owned(), command: cmd.to_owned(),
args: args.to_owned(), args: args.to_owned(),
expected: String::new(), expected: String::new(),
}); });
@ -143,9 +143,9 @@ impl TestFormula {
for test in &self.tests { for test in &self.tests {
for assertion in &test.assertions { for assertion in &test.assertions {
let program = if assertion.program == "rad" { let cmd = if assertion.command == "rad" {
snapbox::cmd::cargo_bin("rad") snapbox::cmd::cargo_bin("rad")
} else if assertion.program == "cd" { } else if assertion.command == "cd" {
let path: PathBuf = assertion.args.first().unwrap().into(); let path: PathBuf = assertion.args.first().unwrap().into();
let path = self.cwd.join(path); let path = self.cwd.join(path);
@ -162,17 +162,17 @@ impl TestFormula {
continue; continue;
} else { } else {
PathBuf::from(&assertion.program) PathBuf::from(&assertion.command)
}; };
log::debug!(target: "test", "Running `{}` in `{}`..", program.display(), self.cwd.display()); log::debug!(target: "test", "Running `{}` in `{}`..", cmd.display(), self.cwd.display());
if !program.exists() { if !cmd.exists() {
log::error!(target: "test", "Program {} does not exist..", program.display()); log::error!(target: "test", "Command {} does not exist..", cmd.display());
} }
if !self.cwd.exists() { if !self.cwd.exists() {
log::error!(target: "test", "Directory {} does not exist..", self.cwd.display()); log::error!(target: "test", "Directory {} does not exist..", self.cwd.display());
} }
let result = Command::new(program.clone()) let result = Command::new(cmd.clone())
.env_clear() .env_clear()
.envs(env::vars().filter(|(k, _)| k == "PATH")) .envs(env::vars().filter(|(k, _)| k == "PATH"))
.envs(self.env.clone()) .envs(self.env.clone())
@ -189,7 +189,7 @@ impl TestFormula {
Err(err) => { Err(err) => {
return Err(io::Error::new( return Err(io::Error::new(
err.kind(), err.kind(),
format!("{err}: `{}`", program.display()), format!("{err}: `{}`", cmd.display()),
)); ));
} }
} }
@ -241,14 +241,14 @@ $ rad sync
context: vec![String::from("Let's try to track @dave and @sean:")], context: vec![String::from("Let's try to track @dave and @sean:")],
assertions: vec![ assertions: vec![
Assertion { Assertion {
program: String::from("rad"), command: String::from("rad"),
args: vec![String::from("track"), String::from("@dave")], args: vec![String::from("track"), String::from("@dave")],
expected: String::from( expected: String::from(
"Tracking relationship established for @dave.\nNothing to do.\n\n", "Tracking relationship established for @dave.\nNothing to do.\n\n",
), ),
}, },
Assertion { Assertion {
program: String::from("rad"), command: String::from("rad"),
args: vec![String::from("track"), String::from("@sean")], args: vec![String::from("track"), String::from("@sean")],
expected: String::from( expected: String::from(
"Tracking relationship established for @sean.\nNothing to do.\n", "Tracking relationship established for @sean.\nNothing to do.\n",
@ -259,7 +259,7 @@ $ rad sync
Test { Test {
context: vec![String::from("Super, now let's move on to the next step.")], context: vec![String::from("Super, now let's move on to the next step.")],
assertions: vec![Assertion { assertions: vec![Assertion {
program: String::from("rad"), command: String::from("rad"),
args: vec![String::from("sync")], args: vec![String::from("sync")],
expected: String::new(), expected: String::new(),
}], }],