[elpa] externals/hyperbole 17aea00 2/3: Merge branch 'master' of hyperbole

[Stefan Monnier]

branch: externals/hyperbole
commit 17aea00b6edc47fc6a37f54515224b57d623a2bd
Merge: 508c1e6 4eef4e9
Author: Bob Weiner <rsw@gnu.org>
Commit: Bob Weiner <rsw@gnu.org>

    Merge branch 'master' of hyperbole
---
 Changes                      | 9 +++++++++
 test/demo-tests.el           | 5 +++--
 test/hibtypes-tests.el       | 2 +-
 test/hy-test-dependencies.el | 6 +++++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Changes b/Changes
index 66db242..7e15e1e 100644
--- a/Changes
+++ b/Changes
@@ -14,6 +14,15 @@
 
 2021-03-14  Mats Lidell  <matsl@gnu.org>
 
+* test/hy-test-dependencies.el (package-installed-p): Check if
+    with-simulated-input is installed.
+
+* test/demo-tests.el (demo-smart-scrolling-non-proportional-test): Make
+    test more robust
+
+* test/hibtypes-tests.el (ibtypes::pathname-env-variable-test): Use env
+    for HOME to not depend on machine or OS specifics
+
 * test/hbut-tests.el (hbut-ib-link-to-file-with-label-variants): Test
     variants of label separation chars and lengths
     (hbut-ib-create-label): Test creation of label
diff --git a/test/demo-tests.el b/test/demo-tests.el
index e258f4e..a0cc222 100644
--- a/test/demo-tests.el
+++ b/test/demo-tests.el
@@ -79,7 +79,6 @@
               (pos (point)))
           (end-of-line)
           (action-key)
-          (beginning-of-line)
           (should (= pos (window-start)))))
     (kill-buffer "DEMO")))
 
@@ -89,10 +88,12 @@
         (hypb:display-file-with-logo (expand-file-name "DEMO" hyperb:dir))
         (goto-char (point-min))
         (re-search-forward "Table of Contents")
+        (beginning-of-line)
         (let ((smart-scroll-proportional nil)
               (pos (point)))
+          (end-of-line)
           (action-key)
-          (should (< pos (point)))))
+          (should (< pos (window-start)))))
     (kill-buffer "DEMO")))
 
 ;; Hyperbole menus
diff --git a/test/hibtypes-tests.el b/test/hibtypes-tests.el
index c095711..4f74482 100644
--- a/test/hibtypes-tests.el
+++ b/test/hibtypes-tests.el
@@ -76,7 +76,7 @@
         (goto-char 2)
         (ibtypes::pathname)
         (should (equal major-mode 'dired-mode))
-        (should (= 0 (string-match "/home/.*" (file-truename 
default-directory)))))
+        (should (= 0 (string-match (getenv "HOME") (file-truename 
default-directory)))))
     nil))
 
 (ert-deftest ibtypes::pathname-emacs-lisp-file-test ()
diff --git a/test/hy-test-dependencies.el b/test/hy-test-dependencies.el
index 364f0c8..4428214 100644
--- a/test/hy-test-dependencies.el
+++ b/test/hy-test-dependencies.el
@@ -19,9 +19,13 @@
 
 (package-initialize)
 (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/";))
+
 (unless (package-installed-p 'el-mock)
   (package-refresh-contents)
-  (package-install 'el-mock)
+  (package-install 'el-mock))
+
+(unless (package-installed-p 'with-simulated-input)
+  (package-refresh-contents)
   (package-install 'with-simulated-input))
 
 (provide 'hy-test-dependencies)