git.iko.soy/bat
on master help sign in
Remove leftovers from tab-tests
f7d9f49sharkdp
tests/snapshot_tests.rs+19−19
compare with master
unifiedsplit
@@ -3,33 +3,33 @@ mod tester;
3use tester::BatTester;
3use tester::BatTester;
4
4
5macro_rules! snapshot_tests {
5macro_rules! snapshot_tests {
6− ($($test_name: ident: $style: expr => [wrap: $wrap:expr, tabs: $tabs:expr],)*) => {
6+ ($($test_name: ident: $style: expr,)*) => {
7 $(
7 $(
8 #[test]
8 #[test]
9 fn $test_name() {
9 fn $test_name() {
10 let bat_tester = BatTester::new();
10 let bat_tester = BatTester::new();
11− bat_tester.test_snapshot(stringify!($test_name), $style, $tabs, $wrap);
11+ bat_tester.test_snapshot(stringify!($test_name), $style);
12 }
12 }
13 )*
13 )*
14 };
14 };
15}
15}
16
16
17snapshot_tests! {
17snapshot_tests! {
18− changes: "changes" => [wrap: false, tabs: 8],
18+ changes: "changes",
19− grid: "grid" => [wrap: false, tabs: 8],
19+ grid: "grid",
20− header: "header" => [wrap: false, tabs: 8],
20+ header: "header",
21− numbers: "numbers" => [wrap: false, tabs: 8],
21+ numbers: "numbers",
22− changes_grid: "changes,grid" => [wrap: false, tabs: 8],
22+ changes_grid: "changes,grid",
23− changes_header: "changes,header" => [wrap: false, tabs: 8],
23+ changes_header: "changes,header",
24− changes_numbers: "changes,numbers" => [wrap: false, tabs: 8],
24+ changes_numbers: "changes,numbers",
25− grid_header: "grid,header" => [wrap: false, tabs: 8],
25+ grid_header: "grid,header",
26− grid_numbers: "grid,numbers" => [wrap: false, tabs: 8],
26+ grid_numbers: "grid,numbers",
27− header_numbers: "header,numbers" => [wrap: false, tabs: 8],
27+ header_numbers: "header,numbers",
28− changes_grid_header: "changes,grid,header" => [wrap: false, tabs: 8],
28+ changes_grid_header: "changes,grid,header",
29− changes_grid_numbers: "changes,grid,numbers" => [wrap: false, tabs: 8],
29+ changes_grid_numbers: "changes,grid,numbers",
30− changes_header_numbers: "changes,header,numbers" => [wrap: false, tabs: 8],
30+ changes_header_numbers: "changes,header,numbers",
31− grid_header_numbers: "grid,header,numbers" => [wrap: false, tabs: 8],
31+ grid_header_numbers: "grid,header,numbers",
32− changes_grid_header_numbers: "changes,grid,header,numbers" => [wrap: false, tabs: 8],
32+ changes_grid_header_numbers: "changes,grid,header,numbers",
33− full: "full" => [wrap: false, tabs: 8],
33+ full: "full",
34− plain: "plain" => [wrap: false, tabs: 0],
34+ plain: "plain",
35}
35}
tests/tester.rs+1−3
@@ -38,7 +38,7 @@ impl BatTester {
38 BatTester { temp_dir, exe }
38 BatTester { temp_dir, exe }
39 }
39 }
40
40
41− pub fn test_snapshot(&self, name: &str, style: &str, tab_width: u32, wrap: bool) {
41+ pub fn test_snapshot(&self, name: &str, style: &str) {
42 let output = Command::new(&self.exe)
42 let output = Command::new(&self.exe)
43 .current_dir(self.temp_dir.path())
43 .current_dir(self.temp_dir.path())
44 .args(&[
44 .args(&[
@@ -48,8 +48,6 @@ impl BatTester {
48 "--color=never",
48 "--color=never",
49 "--decorations=always",
49 "--decorations=always",
50 "--terminal-width=80",
50 "--terminal-width=80",
51− &format!("--wrap={}", if wrap { "character" } else { "never" }),
52− &format!("--tabs={}", tab_width),
53 &format!("--style={}", style),
51 &format!("--style={}", style),
54 ])
52 ])
55 .output()
53 .output()