From f7d9f49503edd0470fc6cda62293203f6dd691c1 Mon Sep 17 00:00:00 2001
From: sharkdp <davidpeter@web.de>
Date: Fri, 19 Oct 2018 21:10:32 +0200
Subject: [PATCH] Remove leftovers from tab-tests

---
 tests/snapshot_tests.rs | 38 +++++++++++++++++++-------------------
 tests/tester.rs         |  4 +---
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/tests/snapshot_tests.rs b/tests/snapshot_tests.rs
index 609f19c5..d357705d 100644
--- a/tests/snapshot_tests.rs
+++ b/tests/snapshot_tests.rs
@@ -3,33 +3,33 @@ mod tester;
 use tester::BatTester;
 
 macro_rules! snapshot_tests {
-    ($($test_name: ident: $style: expr => [wrap: $wrap:expr, tabs: $tabs:expr],)*) => {
+    ($($test_name: ident: $style: expr,)*) => {
         $(
             #[test]
             fn $test_name() {
                 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! {
-    changes:                     "changes"                     => [wrap: false, tabs: 8],
-    grid:                        "grid"                        => [wrap: false, tabs: 8],
-    header:                      "header"                      => [wrap: false, tabs: 8],
-    numbers:                     "numbers"                     => [wrap: false, tabs: 8],
-    changes_grid:                "changes,grid"                => [wrap: false, tabs: 8],
-    changes_header:              "changes,header"              => [wrap: false, tabs: 8],
-    changes_numbers:             "changes,numbers"             => [wrap: false, tabs: 8],
-    grid_header:                 "grid,header"                 => [wrap: false, tabs: 8],
-    grid_numbers:                "grid,numbers"                => [wrap: false, tabs: 8],
-    header_numbers:              "header,numbers"              => [wrap: false, tabs: 8],
-    changes_grid_header:         "changes,grid,header"         => [wrap: false, tabs: 8],
-    changes_grid_numbers:        "changes,grid,numbers"        => [wrap: false, tabs: 8],
-    changes_header_numbers:      "changes,header,numbers"      => [wrap: false, tabs: 8],
-    grid_header_numbers:         "grid,header,numbers"         => [wrap: false, tabs: 8],
-    changes_grid_header_numbers: "changes,grid,header,numbers" => [wrap: false, tabs: 8],
-    full:                        "full"                        => [wrap: false, tabs: 8],
-    plain:                       "plain"                       => [wrap: false, tabs: 0],
+    changes:                     "changes",
+    grid:                        "grid",
+    header:                      "header",
+    numbers:                     "numbers",
+    changes_grid:                "changes,grid",
+    changes_header:              "changes,header",
+    changes_numbers:             "changes,numbers",
+    grid_header:                 "grid,header",
+    grid_numbers:                "grid,numbers",
+    header_numbers:              "header,numbers",
+    changes_grid_header:         "changes,grid,header",
+    changes_grid_numbers:        "changes,grid,numbers",
+    changes_header_numbers:      "changes,header,numbers",
+    grid_header_numbers:         "grid,header,numbers",
+    changes_grid_header_numbers: "changes,grid,header,numbers",
+    full:                        "full",
+    plain:                       "plain",
 }
diff --git a/tests/tester.rs b/tests/tester.rs
index 7307e2f9..a761babe 100644
--- a/tests/tester.rs
+++ b/tests/tester.rs
@@ -38,7 +38,7 @@ impl BatTester {
         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)
             .current_dir(self.temp_dir.path())
             .args(&[
@@ -48,8 +48,6 @@ impl BatTester {
                 "--color=never",
                 "--decorations=always",
                 "--terminal-width=80",
-                &format!("--wrap={}", if wrap { "character" } else { "never" }),
-                &format!("--tabs={}", tab_width),
                 &format!("--style={}", style),
             ])
             .output()