89217e0 · bat · git.iko.soy

git.iko.soy/bat

Make --no-paging and --no-pager work again

commit89217e0d58a9a371540d11eded538721d71c90c7 authorMartin Nordholts <enselic@gmail.com> dateMon 9 Aug 2021, 10:54 (5 years ago) parentcb49739

2 files changed+37

compare with master

unifiedsplit

src/bin/bat/clap_app.rs+1 tests/integration_tests.rs+36

src/bin/bat/clap_app.rs+1

@@ -294,6 +294,7 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {

294294 .arg(

295295 Arg::with_name("no-paging")

296296 .short("P")

297+ .long("no-paging")

297298 .alias("no-pager")

298299 .overrides_with("no-paging")

299300 .hidden(true)

tests/integration_tests.rs+36

@@ -1122,6 +1122,42 @@ fn show_all_mode() {

11221122 .stderr("");

11231123}

11241124

1125+#[test]

1126+fn no_paging_arg() {

1127+ bat()

1128+ .arg("--no-paging")

1129+ .arg("--color=never")

1130+ .arg("--decorations=never")

1131+ .arg("single-line.txt")

1132+ .assert()

1133+ .success()

1134+ .stdout("Single Line");

1135+}

1136+

1137+#[test]

1138+fn no_paging_short_arg() {

1139+ bat()

1140+ .arg("-P")

1141+ .arg("--color=never")

1142+ .arg("--decorations=never")

1143+ .arg("single-line.txt")

1144+ .assert()

1145+ .success()

1146+ .stdout("Single Line");

1147+}

1148+

1149+#[test]

1150+fn no_pager_arg() {

1151+ bat()

1152+ .arg("--no-pager")

1153+ .arg("--color=never")

1154+ .arg("--decorations=never")

1155+ .arg("single-line.txt")

1156+ .assert()

1157+ .success()

1158+ .stdout("Single Line");

1159+}

1160+

11251161#[test]

11261162fn plain_mode_does_not_add_nonexisting_newline() {

11271163 bat()