Fix accidental printing of files named 'cache'

This also adds two regression tests, so this will hopefully not pop up again. closes #557
sharkdp · May 10, 2019 · 6c636fc · 6c636fc
1 parent 1ce0bc8
commit 6c636fc
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/clap_app.rs b/src/clap_app.rs
@@ -18,7 +18,6 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {
         .global_setting(AppSettings::DeriveDisplayOrder)
         .global_setting(AppSettings::UnifiedHelpMessage)
         .global_setting(AppSettings::HidePossibleValuesInHelp)
-        .setting(AppSettings::InferSubcommands)
         .setting(AppSettings::ArgsNegateSubcommands)
         .setting(AppSettings::DisableHelpSubcommand)
         .setting(AppSettings::VersionlessSubcommands)

diff --git a/tests/examples/cache b/tests/examples/cache
@@ -0,0 +1 @@
+test
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
@@ -448,3 +448,18 @@ fn utf16() {
         .success()
         .stdout(std::str::from_utf8(b"\xEF\xBB\xBFhello world\n").unwrap());
 }
+
+#[test]
+fn can_print_file_named_cache() {
+    bat()
+        .arg("cache")
+        .assert()
+        .success()
+        .stdout("test\n")
+        .stderr("");
+}
+
+#[test]
+fn does_not_print_unwanted_file_named_cache() {
+    bat_with_config().arg("cach").assert().failure();
+}