mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
This resolves an issue where navigating back and then forward kept adding new history entries so you could never hit the "end" (bug#69232). * lisp/net/eww.el (eww-before-browse-history-function): New option. (eww-history-position): Add docstring. (eww-mode-map, eww-context-menu): Use correct predicates for when to enable back/forward. (eww-save-history): Save history entry in its original place when viewing a historical page. (eww--before-browse): New function... (eww, eww-follow-link, eww-readable): ... call it. (eww-render): Don't set 'eww-history-position' here... (eww--before-browse): ... instead, set it here. (eww-back-url): Set 'eww-history-position' based on the result of 'eww-save-history'. (eww-forward-url): Set 'eww-history-position' directly, since 'eww-save-history' no longer adds a new entry in this case. (eww-delete-future-history, eww-clone-previous-history): New functions. * test/lisp/net/eww-tests.el: New file. * etc/NEWS: Announce this change.
179 lines
6.9 KiB
EmacsLisp
179 lines
6.9 KiB
EmacsLisp
;;; eww-tests.el --- tests for eww.el -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2024 Free Software Foundation, Inc.
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;;; Code:
|
|
|
|
(require 'ert)
|
|
(require 'eww)
|
|
|
|
(defvar eww-test--response-function (lambda (url) (concat "\n" url))
|
|
"A function for returning a mock response for URL.
|
|
The default just returns an empty list of headers URL as the body.")
|
|
|
|
(defmacro eww-test--with-mock-retrieve (&rest body)
|
|
"Evaluate BODY with a mock implementation of `eww-retrieve'.
|
|
This avoids network requests during our tests. Additionally, prepare a
|
|
temporary EWW buffer for our tests."
|
|
(declare (indent 1))
|
|
`(cl-letf (((symbol-function 'eww-retrieve)
|
|
(lambda (url callback args)
|
|
(with-temp-buffer
|
|
(insert (funcall eww-test--response-function url))
|
|
(apply callback nil args)))))
|
|
(with-temp-buffer
|
|
(eww-mode)
|
|
,@body)))
|
|
|
|
(defun eww-test--history-urls ()
|
|
(mapcar (lambda (elem) (plist-get elem :url)) eww-history))
|
|
|
|
;;; Tests:
|
|
|
|
(ert-deftest eww-test/history/new-page ()
|
|
"Test that when visiting a new page, the previous one goes into the history."
|
|
(eww-test--with-mock-retrieve
|
|
(eww "one.invalid")
|
|
(eww "two.invalid")
|
|
(should (equal (eww-test--history-urls)
|
|
'("http://one.invalid/")))
|
|
(eww "three.invalid")
|
|
(should (equal (eww-test--history-urls)
|
|
'("http://two.invalid/"
|
|
"http://one.invalid/")))))
|
|
|
|
(ert-deftest eww-test/history/back-forward ()
|
|
"Test that navigating through history just changes our history position.
|
|
See bug#69232."
|
|
(eww-test--with-mock-retrieve
|
|
(eww "one.invalid")
|
|
(eww "two.invalid")
|
|
(eww "three.invalid")
|
|
(let ((url-history '("http://three.invalid/"
|
|
"http://two.invalid/"
|
|
"http://one.invalid/")))
|
|
;; Go back one page. This should add "three.invalid" to the
|
|
;; history, making our position in the list 2.
|
|
(eww-back-url)
|
|
(should (equal (eww-test--history-urls) url-history))
|
|
(should (= eww-history-position 2))
|
|
;; Go back again.
|
|
(eww-back-url)
|
|
(should (equal (eww-test--history-urls) url-history))
|
|
(should (= eww-history-position 3))
|
|
;; At the beginning of the history, so trying to go back should
|
|
;; signal an error.
|
|
(should-error (eww-back-url))
|
|
;; Go forward once.
|
|
(eww-forward-url)
|
|
(should (equal (eww-test--history-urls) url-history))
|
|
(should (= eww-history-position 2))
|
|
;; Go forward again.
|
|
(eww-forward-url)
|
|
(should (equal (eww-test--history-urls) url-history))
|
|
(should (= eww-history-position 1))
|
|
;; At the end of the history, so trying to go forward should
|
|
;; signal an error.
|
|
(should-error (eww-forward-url)))))
|
|
|
|
(ert-deftest eww-test/history/reload-in-place ()
|
|
"Test that reloading historical pages updates their history entry in-place.
|
|
See bug#69232."
|
|
(eww-test--with-mock-retrieve
|
|
(eww "one.invalid")
|
|
(eww "two.invalid")
|
|
(eww "three.invalid")
|
|
(eww-back-url)
|
|
;; Make sure our history has the original page text.
|
|
(should (equal (plist-get (nth 1 eww-history) :text)
|
|
"http://two.invalid/"))
|
|
(should (= eww-history-position 2))
|
|
;; Reload the page.
|
|
(let ((eww-test--response-function
|
|
(lambda (url) (concat "\nreloaded " url))))
|
|
(eww-reload)
|
|
(should (= eww-history-position 2)))
|
|
;; Go to another page, and make sure the history is correct,
|
|
;; including the reloaded page text.
|
|
(eww "four.invalid")
|
|
(should (equal (eww-test--history-urls) '("http://two.invalid/"
|
|
"http://one.invalid/")))
|
|
(should (equal (plist-get (nth 0 eww-history) :text)
|
|
"reloaded http://two.invalid/"))
|
|
(should (= eww-history-position 0))))
|
|
|
|
(ert-deftest eww-test/history/before-navigate/delete-future-history ()
|
|
"Test that going to a new page from a historical one deletes future history.
|
|
See bug#69232."
|
|
(eww-test--with-mock-retrieve
|
|
(eww "one.invalid")
|
|
(eww "two.invalid")
|
|
(eww "three.invalid")
|
|
(eww-back-url)
|
|
(eww "four.invalid")
|
|
(eww "five.invalid")
|
|
(should (equal (eww-test--history-urls) '("http://four.invalid/"
|
|
"http://two.invalid/"
|
|
"http://one.invalid/")))
|
|
(should (= eww-history-position 0))))
|
|
|
|
(ert-deftest eww-test/history/before-navigate/ignore-history ()
|
|
"Test that going to a new page from a historical one preserves history.
|
|
This sets `eww-before-browse-history-function' to `ignore' to preserve
|
|
history. See bug#69232."
|
|
(let ((eww-before-browse-history-function #'ignore))
|
|
(eww-test--with-mock-retrieve
|
|
(eww "one.invalid")
|
|
(eww "two.invalid")
|
|
(eww "three.invalid")
|
|
(eww-back-url)
|
|
(eww "four.invalid")
|
|
(eww "five.invalid")
|
|
(should (equal (eww-test--history-urls) '("http://four.invalid/"
|
|
"http://three.invalid/"
|
|
"http://two.invalid/"
|
|
"http://one.invalid/")))
|
|
(should (= eww-history-position 0)))))
|
|
|
|
(ert-deftest eww-test/history/before-navigate/clone-previous ()
|
|
"Test that going to a new page from a historical one clones prior history.
|
|
This sets `eww-before-browse-history-function' to
|
|
`eww-clone-previous-history' to clone the history. See bug#69232."
|
|
(let ((eww-before-browse-history-function #'eww-clone-previous-history))
|
|
(eww-test--with-mock-retrieve
|
|
(eww "one.invalid")
|
|
(eww "two.invalid")
|
|
(eww "three.invalid")
|
|
(eww-back-url)
|
|
(eww "four.invalid")
|
|
(eww "five.invalid")
|
|
(should (equal (eww-test--history-urls)
|
|
'(;; New page and cloned history.
|
|
"http://four.invalid/"
|
|
"http://two.invalid/"
|
|
"http://one.invalid/"
|
|
;; Original history.
|
|
"http://three.invalid/"
|
|
"http://two.invalid/"
|
|
"http://one.invalid/")))
|
|
(should (= eww-history-position 0)))))
|
|
|
|
(provide 'eww-tests)
|
|
;; eww-tests.el ends here
|