@@ -1,14 +1,11 @@
1−use assert_cmd::assert::OutputAssertExt;
2−use assert_cmd::cargo::CommandCargoExt;
1+use assert_cmd::Command;
32use predicates::{prelude::predicate, str::PredicateStrExt};
4−use std::fs::File;
53use std::path::Path;
6−use std::process::{Command, Stdio};
74use std::str::from_utf8;
85
96const EXAMPLES_DIR: &str = "tests/examples";
107
11−fn bat_as_std() -> Command {
8+fn bat_with_config() -> Command {
129 let mut cmd = Command::cargo_bin("bat").unwrap();
1310 cmd.current_dir("tests/examples");
1411 cmd.env_remove("PAGER");
@@ -20,11 +17,7 @@ fn bat_as_std() -> Command {
2017 cmd
2118}
2219
23−fn bat_with_config() -> assert_cmd::Command {
24− assert_cmd::Command::from_std(bat_as_std())
25−}
26−
27−fn bat() -> assert_cmd::Command {
20+fn bat() -> Command {
2821 let mut cmd = bat_with_config();
2922 cmd.arg("--no-config");
3023 cmd
@@ -196,30 +189,6 @@ fn line_range_multiple() {
196189 .stdout("line 1\nline 2\nline 4\n");
197190}
198191
199−#[test]
200−fn basic_io_cycle() {
201− let file_out = Stdio::from(File::open("tests/examples/cycle.txt").unwrap());
202− bat_as_std()
203− .arg("test.txt")
204− .arg("cycle.txt")
205− .stdout(file_out)
206− .assert()
207− .failure();
208−}
209−
210−#[test]
211−fn stdin_to_stdout_cycle() {
212− let file_out = Stdio::from(File::open("tests/examples/cycle.txt").unwrap());
213− let file_in = Stdio::from(File::open("tests/examples/cycle.txt").unwrap());
214− bat_as_std()
215− .stdin(file_in)
216− .arg("test.txt")
217− .arg("-")
218− .stdout(file_out)
219− .assert()
220− .failure();
221−}
222−
223192#[test]
224193fn tabs_numbers() {
225194 bat()