Merge pull request #536 from dandavison/navigate-less-integration-tests

Add navigate/less integration test

3 files changed, 61 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 6c586645..c534338f 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ unit-test:
 end-to-end-test: build
 	./tests/test_raw_output_matches_git_on_full_repo_history
 	./tests/test_deprecated_options > /dev/null
+	./test/test_navigate_less_history_file
 
 release:
 	@make -f release.Makefile release
diff --git a/src/bat_utils/output.rs b/src/bat_utils/output.rs
index 8e959eb7..26cd4e21 100644
--- a/src/bat_utils/output.rs
+++ b/src/bat_utils/output.rs
@@ -132,7 +132,7 @@ delta is not an appropriate value for $PAGER \
                     p.args(args);
                     p
                 };
-                if config.navigate {
+                if is_less && config.navigate {
                     if let Ok(hist_file) =
                         navigate::copy_less_hist_file_and_append_navigate_regexp(config)
                     {
diff --git a/tests/test_navigate_less_history_file b/tests/test_navigate_less_history_file
new file mode 100755
index 00000000..7ec5a95f
--- /dev/null
+++ b/tests/test_navigate_less_history_file
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+set -e
+
+cleanup() {
+    rm -r "$TEMPDIR"
+}
+
+die() {
+    echo "$1" 1>&2
+    cleanup
+    exit 1
+}
+
+DELTA="${1:-./target/release/delta} --no-gitconfig --navigate"
+
+# Trick delta into thinking that its pager is less, when really it is cat.
+unset DELTA_PAGER
+TEMPDIR="$(mktemp -d)"
+export PAGER="$TEMPDIR/less"
+cat >"$PAGER" <<-EOF
+	#!/bin/sh
+	cat
+EOF
+chmod 755 $PAGER
+
+test_delta_less_hist_file_created () {
+    DELTA_HIST_FILE="${XDG_DATA_HOME:-$HOME/.local/share}/delta/lesshst"
+    rm -f ~/.lesshst "$DELTA_HIST_FILE"
+    [ -e "$DELTA_HIST_FILE" ] && die "Expected \"$DELTA_HIST_FILE\" not to exist"
+    git -c pager.log="$DELTA" log -p HEAD~2...HEAD
+    [ -e "$DELTA_HIST_FILE" ] || die "Expected \"$DELTA_HIST_FILE\" to exist"
+}
+
+# Basic test
+test_delta_less_hist_file_created
+
+# Test it works with a custom LESSHISTFILE
+export LESSHISTFILE=$TEMPDIR/delta.lesshst
+test_delta_less_hist_file_created
+
+# Test histfile sections other than `.search` at the end of the file (#1)
+cat >$LESSHISTFILE <<-EOF
+	.shell
+	"pwd
+	"ls -Al ../data/
+EOF
+test_delta_less_hist_file_created
+
+# Test histfile sections other than `.search` at the end of the file (#2)
+cat >>$LESSHISTFILE <<-EOF
+	.mark
+	m a 1 7740 /etc/gitconfig
+	m b 1 4221 /etc/profile
+EOF
+test_delta_less_hist_file_created
+
+# Cleanup
+cleanup