summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Nordholts <enselic@gmail.com>2021-08-09 10:54:32 +0200
committerMartin Nordholts <enselic@gmail.com>2021-08-09 13:37:56 +0200
commit89217e0d58a9a371540d11eded538721d71c90c7 (patch)
tree618499339382b91234bc37044b4d1327a29b62d9
parentcb4973987b238bfc7cb63e47950a13e815706592 (diff)
Make --no-paging and --no-pager work again
-rw-r--r--src/bin/bat/clap_app.rs1
-rw-r--r--tests/integration_tests.rs36
2 files changed, 37 insertions, 0 deletions
diff --git a/src/bin/bat/clap_app.rs b/src/bin/bat/clap_app.rs
index 57e070af..2ac0eba5 100644
--- a/src/bin/bat/clap_app.rs
+++ b/src/bin/bat/clap_app.rs
@@ -294,6 +294,7 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {
.arg(
Arg::with_name("no-paging")
.short("P")
+ .long("no-paging")
.alias("no-pager")
.overrides_with("no-paging")
.hidden(true)
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
index d2c8501f..18f16123 100644
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@@ -1123,6 +1123,42 @@ fn show_all_mode() {
}
#[test]
+fn no_paging_arg() {
+ bat()
+ .arg("--no-paging")
+ .arg("--color=never")
+ .arg("--decorations=never")
+ .arg("single-line.txt")
+ .assert()
+ .success()
+ .stdout("Single Line");
+}
+
+#[test]
+fn no_paging_short_arg() {
+ bat()
+ .arg("-P")
+ .arg("--color=never")
+ .arg("--decorations=never")
+ .arg("single-line.txt")
+ .assert()
+ .success()
+ .stdout("Single Line");
+}
+
+#[test]
+fn no_pager_arg() {
+ bat()
+ .arg("--no-pager")
+ .arg("--color=never")
+ .arg("--decorations=never")
+ .arg("single-line.txt")
+ .assert()
+ .success()
+ .stdout("Single Line");
+}
+
+#[test]
fn plain_mode_does_not_add_nonexisting_newline() {
bat()
.arg("--paging=never")