Remove leftovers from tab-tests

This commit is contained in:
sharkdp 2018-10-19 21:10:32 +02:00 committed by David Peter
parent 88fcfd76aa
commit f7d9f49503
2 changed files with 20 additions and 22 deletions

View File

@ -3,33 +3,33 @@ mod tester;
use tester::BatTester; use tester::BatTester;
macro_rules! snapshot_tests { macro_rules! snapshot_tests {
($($test_name: ident: $style: expr => [wrap: $wrap:expr, tabs: $tabs:expr],)*) => { ($($test_name: ident: $style: expr,)*) => {
$( $(
#[test] #[test]
fn $test_name() { fn $test_name() {
let bat_tester = BatTester::new(); let bat_tester = BatTester::new();
bat_tester.test_snapshot(stringify!($test_name), $style, $tabs, $wrap); bat_tester.test_snapshot(stringify!($test_name), $style);
} }
)* )*
}; };
} }
snapshot_tests! { snapshot_tests! {
changes: "changes" => [wrap: false, tabs: 8], changes: "changes",
grid: "grid" => [wrap: false, tabs: 8], grid: "grid",
header: "header" => [wrap: false, tabs: 8], header: "header",
numbers: "numbers" => [wrap: false, tabs: 8], numbers: "numbers",
changes_grid: "changes,grid" => [wrap: false, tabs: 8], changes_grid: "changes,grid",
changes_header: "changes,header" => [wrap: false, tabs: 8], changes_header: "changes,header",
changes_numbers: "changes,numbers" => [wrap: false, tabs: 8], changes_numbers: "changes,numbers",
grid_header: "grid,header" => [wrap: false, tabs: 8], grid_header: "grid,header",
grid_numbers: "grid,numbers" => [wrap: false, tabs: 8], grid_numbers: "grid,numbers",
header_numbers: "header,numbers" => [wrap: false, tabs: 8], header_numbers: "header,numbers",
changes_grid_header: "changes,grid,header" => [wrap: false, tabs: 8], changes_grid_header: "changes,grid,header",
changes_grid_numbers: "changes,grid,numbers" => [wrap: false, tabs: 8], changes_grid_numbers: "changes,grid,numbers",
changes_header_numbers: "changes,header,numbers" => [wrap: false, tabs: 8], changes_header_numbers: "changes,header,numbers",
grid_header_numbers: "grid,header,numbers" => [wrap: false, tabs: 8], grid_header_numbers: "grid,header,numbers",
changes_grid_header_numbers: "changes,grid,header,numbers" => [wrap: false, tabs: 8], changes_grid_header_numbers: "changes,grid,header,numbers",
full: "full" => [wrap: false, tabs: 8], full: "full",
plain: "plain" => [wrap: false, tabs: 0], plain: "plain",
} }

View File

@ -38,7 +38,7 @@ impl BatTester {
BatTester { temp_dir, exe } BatTester { temp_dir, exe }
} }
pub fn test_snapshot(&self, name: &str, style: &str, tab_width: u32, wrap: bool) { pub fn test_snapshot(&self, name: &str, style: &str) {
let output = Command::new(&self.exe) let output = Command::new(&self.exe)
.current_dir(self.temp_dir.path()) .current_dir(self.temp_dir.path())
.args(&[ .args(&[
@ -48,8 +48,6 @@ impl BatTester {
"--color=never", "--color=never",
"--decorations=always", "--decorations=always",
"--terminal-width=80", "--terminal-width=80",
&format!("--wrap={}", if wrap { "character" } else { "never" }),
&format!("--tabs={}", tab_width),
&format!("--style={}", style), &format!("--style={}", style),
]) ])
.output() .output()