Skip to content
This repository was archived by the owner on Dec 29, 2021. It is now read-only.

fix: Remove unrelated output in main_binary #50

Merged
merged 3 commits into from
Oct 17, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ categories = ["development-tools::testing"]
keywords = ["cli", "testing", "assert"]
build = "build.rs"

[[bin]]
name = "assert_fixture"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This binary is built only when building assert_cli itself, right? I.e., not when using it as a dependency. Is there any chance people might cargo install this? We could add a internal-tests feature and specify required-features for the bin. Or, can we add bins depending on cfg(test) in some other way?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This binary is built only when building assert_cli itself, right? I.e., not when using it as a dependency.

I think I've heard depending on something doesn't pull in the bins.

Is there any chance people might cargo install this?

If they did, it wouldn't do them much good.

We could add a internal-tests feature and specify required-features for the bin. Or, can we add bins depending on cfg(test) in some other way?

The problem with relying on features is main_binary can't enable the feature.


[dependencies]
colored = "1.5"
difference = "1.0"
Expand Down
11 changes: 7 additions & 4 deletions src/assert.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use environment::Environment;
use error_chain::ChainedError;
use errors::*;
use output::{OutputAssertion, OutputKind};
use std::default;
Expand All @@ -25,7 +26,7 @@ impl default::Default for Assert {
/// Defaults to asserting _successful_ execution.
fn default() -> Self {
Assert {
cmd: vec!["cargo", "run", "--"]
cmd: vec!["cargo", "run", "--quiet", "--"]
.into_iter()
.map(String::from)
.collect(),
Expand All @@ -52,7 +53,7 @@ impl Assert {
/// Defaults to asserting _successful_ execution.
pub fn cargo_binary(name: &str) -> Self {
Assert {
cmd: vec!["cargo", "run", "--bin", name, "--"]
cmd: vec!["cargo", "run", "--quiet", "--bin", name, "--"]
.into_iter()
.map(String::from)
.collect(),
Expand Down Expand Up @@ -332,7 +333,9 @@ impl Assert {
None => command,
};

let mut spawned = command.spawn()?;
let mut spawned = command
.spawn()
.chain_err(|| ErrorKind::SpawnFailed(self.cmd.clone()))?;

if let Some(ref contents) = self.stdin_contents {
spawned
Expand Down Expand Up @@ -389,7 +392,7 @@ impl Assert {
/// ```
pub fn unwrap(self) {
if let Err(err) = self.execute() {
panic!("{}", err);
panic!("{}", err.display_chain());
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

}
}
}
Expand Down
31 changes: 31 additions & 0 deletions src/bin/assert_fixture.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#[macro_use]
extern crate error_chain;

use std::env;
use std::process;

error_chain! {
foreign_links {
Env(env::VarError);
ParseInt(std::num::ParseIntError);
}
}

fn run() -> Result<()> {
if let Ok(text) = env::var("stdout") {
println!("{}", text);
}
if let Ok(text) = env::var("stderr") {
eprintln!("{}", text);
}

let code = env::var("exit")
.ok()
.map(|v| v.parse::<i32>())
.map_or(Ok(None), |r| r.map(Some))
.chain_err(|| "Invalid exit code")?
.unwrap_or(0);
process::exit(code);
}

quick_main!(run);
8 changes: 8 additions & 0 deletions src/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ error_chain! {
Fmt(::std::fmt::Error);
}
errors {
SpawnFailed(cmd: Vec<String>) {
description("Spawn failed")
display(
"{}: (command `{}` failed to run)",
ERROR_PREFIX,
cmd.join(" "),
)
}
StatusMismatch(cmd: Vec<String>, expected: bool, out: String, err: String) {
description("Wrong status")
display(
Expand Down
23 changes: 23 additions & 0 deletions tests/cargo.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
extern crate assert_cli;

#[test]
fn main_binary() {
assert_cli::Assert::main_binary()
.with_env(assert_cli::Environment::inherit().insert("stdout", "42"))
.stdout()
.is("42")
.stderr()
.is("")
.unwrap();
}

#[test]
fn cargo_binary() {
assert_cli::Assert::cargo_binary("assert_fixture")
.with_env(assert_cli::Environment::inherit().insert("stdout", "42"))
.stdout()
.is("42")
.stderr()
.is("")
.unwrap();
}