From e7c7da386c812f9452b072567e822077180f3dc5 Mon Sep 17 00:00:00 2001
From: Holger Dürer <me@hdurer.net>
Date: Mon, 1 Nov 2021 15:53:37 +0100
Subject: Fix tests.

These needed a bit of tender love and care to get back into passing
state.

- Move the auth tests to the `test` directory.  No idea what it was
  doing in `lisp`.
- Image tests are mostly broken because with later Emacsen we no
  longer need the `imagemagic` option on create-image.
- Some method signatures have changed and mocking calls needed to
  follow suit.
---
 test/ert-helper.el                  | 11 ++++++---
 test/mastodon-auth-test.el          | 47 +++++++++++++++++++++++++++++++++++++
 test/mastodon-http-tests.el         |  2 +-
 test/mastodon-media-tests.el        | 34 ++++++++++++++++++---------
 test/mastodon-notifications-test.el |  2 +-
 test/mastodon-tl-tests.el           |  6 ++---
 6 files changed, 83 insertions(+), 19 deletions(-)
 create mode 100644 test/mastodon-auth-test.el

(limited to 'test')

diff --git a/test/ert-helper.el b/test/ert-helper.el
index 6979837..d3e0016 100644
--- a/test/ert-helper.el
+++ b/test/ert-helper.el
@@ -1,8 +1,13 @@
+(load-file "lisp/mastodon-async.el")
 (load-file "lisp/mastodon-http.el")
-(load-file "lisp/mastodon-client.el")
 (load-file "lisp/mastodon-auth.el")
-(load-file "lisp/mastodon-toot.el")
+(load-file "lisp/mastodon-client.el")
+(load-file "lisp/mastodon-discover.el")
+(load-file "lisp/mastodon-inspect.el")
 (load-file "lisp/mastodon-media.el")
-(load-file "lisp/mastodon-tl.el")
 (load-file "lisp/mastodon-notifications.el")
+(load-file "lisp/mastodon-profile.el")
+(load-file "lisp/mastodon-search.el")
+(load-file "lisp/mastodon-tl.el")
+(load-file "lisp/mastodon-toot.el")
 (load-file "lisp/mastodon.el")
diff --git a/test/mastodon-auth-test.el b/test/mastodon-auth-test.el
new file mode 100644
index 0000000..9a765b9
--- /dev/null
+++ b/test/mastodon-auth-test.el
@@ -0,0 +1,47 @@
+;;; mastodon-auth--test.el --- Tests for mastodon-auth  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2020  Ian Eure
+
+;; Author: Ian Eure <ian@retrospec.tv>
+;; Version: 0.9.1
+;; Homepage: https://github.com/jdenen/mastodon.el
+;; Package-Requires: ((emacs "26.1"))
+
+;; This file is not part of GNU Emacs.
+
+;; This file is part of mastodon.el.
+
+;; This program 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.
+
+;; This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; mastodon-auth--test.el provides ERT tests for mastodon-auth.el
+
+;;; Code:
+
+(require 'ert)
+
+(ert-deftest mastodon-auth--handle-token-response--good ()
+  (should (string= "foo" (mastodon-auth--handle-token-response '(:access_token "foo" :token_type "Bearer" :scope "read write follow" :created_at 0)))))
+
+(ert-deftest mastodon-auth--handle-token-response--unknown ()
+  :expected-result :failed
+  (mastodon-auth--handle-token-response '(:herp "derp")))
+
+(ert-deftest mastodon-auth--handle-token-response--failure ()
+  :expected-result :failed
+  (mastodon-auth--handle-token-response '(:error "invalid_grant" :error_description "The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client.")))
+
+(provide 'mastodon-auth--test)
+;;; mastodon-auth--test.el ends here
diff --git a/test/mastodon-http-tests.el b/test/mastodon-http-tests.el
index 972cedb..d0f715e 100644
--- a/test/mastodon-http-tests.el
+++ b/test/mastodon-http-tests.el
@@ -4,6 +4,6 @@
   "Should make a `url-retrieve' of the given URL."
   (let ((callback-double (lambda () "double")))
     (with-mock
-      (mock (url-retrieve-synchronously "https://foo.bar/baz"))
+      (mock (mastodon-http--url-retrieve-synchronously "https://foo.bar/baz"))
       (mock (mastodon-auth--access-token) => "test-token")
       (mastodon-http--get "https://foo.bar/baz"))))
diff --git a/test/mastodon-media-tests.el b/test/mastodon-media-tests.el
index a586be9..20993f9 100644
--- a/test/mastodon-media-tests.el
+++ b/test/mastodon-media-tests.el
@@ -4,7 +4,7 @@
   "Should return text with all expected properties."
   (with-mock
     (mock (image-type-available-p 'imagemagick) => t)
-    (mock (create-image * 'imagemagick t :height 123) => :mock-image)
+    (mock (create-image * (when (version< emacs-version "27.1") 'imagemagick) t :height 123) => :mock-image)
 
     (let* ((mastodon-media--avatar-height 123)
            (result (mastodon-media--get-avatar-rendering "http://example.org/img.png"))
@@ -37,12 +37,15 @@
         (mastodon-media--avatar-height 123))
     (with-mock
       (mock (image-type-available-p 'imagemagick) => t)
-      (mock (create-image * 'imagemagick t :height 123) => '(image foo))
+      (mock (create-image
+             *
+             (when (version< emacs-version "27.1") 'imagemagick)
+             t :height 123) => '(image foo))
       (mock (copy-marker 7) => :my-marker )
       (mock (url-retrieve
              url
              #'mastodon-media--process-image-response
-             '(:my-marker (:height 123) 1))
+             `(:my-marker (:height 123) 1 ,url))
             => :called-as-expected)
 
       (with-temp-buffer
@@ -62,7 +65,7 @@
       (mock (url-retrieve
              url
              #'mastodon-media--process-image-response
-             '(:my-marker () 1))
+             `(:my-marker () 1 ,url))
             => :called-as-expected)
 
       (with-temp-buffer
@@ -82,7 +85,7 @@
       (mock (url-retrieve
              "http://example.org/image.png"
              #'mastodon-media--process-image-response
-             '(:my-marker (:max-height 321) 5))
+             '(:my-marker (:max-height 321) 5 "http://example.org/image.png"))
             => :called-as-expected)
       (with-temp-buffer
         (insert (concat "Start:"
@@ -101,7 +104,7 @@
       (mock (url-retrieve
              "http://example.org/image.png"
              #'mastodon-media--process-image-response
-             '(:my-marker () 5))
+             '(:my-marker () 5 "http://example.org/image.png"))
             => :called-as-expected)
 
       (with-temp-buffer
@@ -117,7 +120,10 @@
         (mastodon-media--avatar-height 123))
     (with-mock
       (mock (image-type-available-p 'imagemagick) => t)
-      (mock (create-image * 'imagemagick t :height 123) => '(image foo))
+      (mock (create-image
+             *
+             (when (version< emacs-version "27.1") 'imagemagick)
+             t :height 123) => '(image foo))
       (stub url-retrieve => (error "url-retrieve failed"))
 
       (with-temp-buffer
@@ -139,9 +145,11 @@
        (insert "start:")
        (setq used-marker (copy-marker (point))
              saved-marker (copy-marker (point)))
-       ;; Mock needed for the preliminary image created in mastodon-media--get-avatar-rendering
+       ;; Mock needed for the preliminary image created in
+       ;; mastodon-media--get-avatar-rendering
        (stub create-image => :fake-image)
-       (insert (mastodon-media--get-avatar-rendering "http://example.org/image.png")
+       (insert (mastodon-media--get-avatar-rendering
+                "http://example.org/image.png.")
                ":end")
        (with-temp-buffer
          (insert "some irrelevant\n"
@@ -150,9 +158,13 @@
                  "fake\nimage\ndata")
          (goto-char (point-min))
 
-         (mock (create-image "fake\nimage\ndata" 'imagemagick t ':image :option) => :fake-image)
+         (mock (create-image
+                "fake\nimage\ndata"
+                (when (version< emacs-version "27.1") 'imagemagick)
+                t ':image :option) => :fake-image)
 
-         (mastodon-media--process-image-response () used-marker '(:image :option) 1)
+         (mastodon-media--process-image-response
+          () used-marker '(:image :option) 1 "http://example.org/image.png")
 
          ;; the used marker has been unset:
          (should (null (marker-position used-marker)))
diff --git a/test/mastodon-notifications-test.el b/test/mastodon-notifications-test.el
index 19b591d..778d350 100644
--- a/test/mastodon-notifications-test.el
+++ b/test/mastodon-notifications-test.el
@@ -185,7 +185,7 @@
   "Ensure get request format for notifictions is accurate."
   (let ((mastodon-instance-url "https://instance.url"))
     (with-mock
-      (mock (mastodon-http--get-json-async "https://instance.url/api/v1/notifications" 'mastodon-tl--init* "*mastodon-notifications*" "notifications" 'mastodon-notifications--timeline))
+      (mock (mastodon-http--get-json "https://instance.url/api/v1/notifications" ))
       (mastodon-notifications--get))))
 
 (defun mastodon-notifications--test-type (fun sample)
diff --git a/test/mastodon-tl-tests.el b/test/mastodon-tl-tests.el
index c7dfc9a..24de5d0 100644
--- a/test/mastodon-tl-tests.el
+++ b/test/mastodon-tl-tests.el
@@ -285,7 +285,7 @@ a string or a numeric."
                         (mastodon-tl--byline mastodon-tl-test-base-toot
                                              'mastodon-tl--byline-author
                                              'mastodon-tl--byline-boosted))
-                       "  Account 42 (@acct42@example.space) 2999-99-99 00:11:22
+                       "Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
 ")))))
 
@@ -395,8 +395,8 @@ a string or a numeric."
                         (mastodon-tl--byline toot
                                              'mastodon-tl--byline-author
                                              'mastodon-tl--byline-boosted))
-                       "  Account 42 (@acct42@example.space)
- Boosted   Account 43 (@acct43@example.space) original time
+                       "Account 42 (@acct42@example.space)
+ Boosted Account 43 (@acct43@example.space) original time
   ------------
 ")))))
 
-- 
cgit v1.2.3


From af72d4943ad942712ec74a387e79fb1d53e6bee8 Mon Sep 17 00:00:00 2001
From: mousebot <mousebot@riseup.net>
Date: Sat, 6 Nov 2021 15:06:25 +0100
Subject: update mastodon-notifications--test-byline-concat for post notify

---
 test/mastodon-notifications-test.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/mastodon-notifications-test.el b/test/mastodon-notifications-test.el
index 19b591d..7b88de0 100644
--- a/test/mastodon-notifications-test.el
+++ b/test/mastodon-notifications-test.el
@@ -208,6 +208,8 @@ notification to be tested."
            (string= " Favourited your status from"
                     (mastodon-notifications--byline-concat "Favourited"))
            (string= " Boosted your status from"
-                    (mastodon-notifications--byline-concat "Boosted")))))
+                    (mastodon-notifications--byline-concat "Boosted"))
+           (string= " Posted a post"
+                    (mastodon-notifications--byline-concat "Posted")))))
 
 
-- 
cgit v1.2.3


From 14476572dafe12454015189f67d8f29f50b25ccb Mon Sep 17 00:00:00 2001
From: mousebot <mousebot@riseup.net>
Date: Sat, 6 Nov 2021 14:53:24 +0100
Subject: add tests for -search.el

---
 test/ert-helper.el            |   1 +
 test/mastodon-search-tests.el | 141 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 142 insertions(+)
 create mode 100644 test/mastodon-search-tests.el

(limited to 'test')

diff --git a/test/ert-helper.el b/test/ert-helper.el
index d3e0016..a6d6692 100644
--- a/test/ert-helper.el
+++ b/test/ert-helper.el
@@ -1,3 +1,4 @@
+(load-file "lisp/mastodon-search.el")
 (load-file "lisp/mastodon-async.el")
 (load-file "lisp/mastodon-http.el")
 (load-file "lisp/mastodon-auth.el")
diff --git a/test/mastodon-search-tests.el b/test/mastodon-search-tests.el
new file mode 100644
index 0000000..b8521f3
--- /dev/null
+++ b/test/mastodon-search-tests.el
@@ -0,0 +1,141 @@
+
+
+(defconst mastodon-search--single-account-query
+  '((id . "242971")
+    (username . "mousebot")
+    (acct . "mousebot")
+    (display_name . ": ( ) { : | : & } ; :")
+    (locked . t)
+    (bot . :json-false)
+    (discoverable . t)
+    (group . :json-false)
+    (created_at . "2020-04-14T00:00:00.000Z")
+    (note . "<p>poetry, writing, dmt, desertion, trash, black metal, translation, hegel, language, autonomia....</p><p><a href=\"https://anarchive.mooo.com\" rel=\"nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">anarchive.mooo.com</span><span class=\"invisible\"></span></a><br /><a href=\"https://pleasantlybabykid.tumblr.com/\" rel=\"nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">pleasantlybabykid.tumblr.com/</span><span class=\"invisible\"></span></a><br />IG: <a href=\"https://bibliogram.snopyta.org/u/martianhiatus\" rel=\"nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"ellipsis\">bibliogram.snopyta.org/u/marti</span><span class=\"invisible\">anhiatus</span></a><br />photos alt: <span class=\"h-card\"><a href=\"https://todon.eu/@goosebot\" class=\"u-url mention\">@<span>goosebot</span></a></span><br />git: <a href=\"https://git.blast.noho.st/mouse\" rel=\"nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">git.blast.noho.st/mouse</span><span class=\"invisible\"></span></a></p><p>want to trade chapbooks or zines? hmu!</p><p>he/him or they/them</p>")
+    (url . "https://todon.nl/@mousebot")
+    (avatar . "https://todon.nl/system/accounts/avatars/000/242/971/original/0a5e801576af597b.jpg")
+    (avatar_static . "https://todon.nl/system/accounts/avatars/000/242/971/original/0a5e801576af597b.jpg")
+    (header . "https://todon.nl/system/accounts/headers/000/242/971/original/f85f7f1048237fd4.jpg")
+    (header_static . "https://todon.nl/system/accounts/headers/000/242/971/original/f85f7f1048237fd4.jpg")
+    (followers_count . 226)
+    (following_count . 634)
+    (statuses_count . 3807)
+    (last_status_at . "2021-11-05")
+    (emojis .
+            [])
+    (fields .
+            [((name . "dark to")
+              (value . "themselves")
+              (verified_at))
+             ((name . "its raining")
+              (value . "plastic")
+              (verified_at))
+             ((name . "dis")
+              (value . "integration")
+              (verified_at))
+             ((name . "ungleichzeitigkeit und")
+              (value . "gleichzeitigkeit, philosophisch")
+              (verified_at))]))
+  "A sample mastodon account search result (parsed json)")
+
+(defconst mastodon-search-test-single-tag
+  '((name . "TeamBringBackVisibleScrollbars") (url . "https://todon.nl/tags/TeamBringBackVisibleScrollbars") (history . [((day . "1636156800") (uses . "0") (accounts . "0")) ((day . "1636070400") (uses . "0") (accounts . "0")) ((day . "1635984000") (uses . "0") (accounts . "0")) ((day . "1635897600") (uses . "0") (accounts . "0")) ((day . "1635811200") (uses . "0") (accounts . "0")) ((day . "1635724800") (uses . "0") (accounts . "0")) ((day . "1635638400") (uses . "0") (accounts . "0"))])))
+
+(defconst mastodon-search-test-single-status
+  '((id . "107230316503209282")
+    (created_at . "2021-11-06T13:19:40.628Z")
+    (in_reply_to_id)
+    (in_reply_to_account_id)
+    (sensitive . :json-false)
+    (spoiler_text . "")
+    (visibility . "direct")
+    (language . "en")
+    (uri . "https://todon.nl/users/mousebot/statuses/107230316503209282")
+    (url . "https://todon.nl/@mousebot/107230316503209282")
+    (replies_count . 0)
+    (reblogs_count . 0)
+    (favourites_count . 0)
+    (favourited . :json-false)
+    (reblogged . :json-false)
+    (muted . :json-false)
+    (bookmarked . :json-false)
+    (content . "<p>This is a nice test toot, for testing purposes. Thank you.</p>")
+    (reblog)
+    (application
+     (name . "mastodon.el")
+     (website . "https://github.com/jdenen/mastodon.el"))
+    (account
+     (id . "242971")
+     (username . "mousebot")
+     (acct . "mousebot")
+     (display_name . ": ( ) { : | : & } ; :")
+     (locked . t)
+     (bot . :json-false)
+     (discoverable . t)
+     (group . :json-false)
+     (created_at . "2020-04-14T00:00:00.000Z")
+     (note . "<p>poetry, writing, dmt, desertion, trash, black metal, translation, hegel, language, autonomia....</p><p><a href=\"https://anarchive.mooo.com\" rel=\"nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">anarchive.mooo.com</span><span class=\"invisible\"></span></a><br /><a href=\"https://pleasantlybabykid.tumblr.com/\" rel=\"nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">pleasantlybabykid.tumblr.com/</span><span class=\"invisible\"></span></a><br />IG: <a href=\"https://bibliogram.snopyta.org/u/martianhiatus\" rel=\"nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"ellipsis\">bibliogram.snopyta.org/u/marti</span><span class=\"invisible\">anhiatus</span></a><br />photos alt: <span class=\"h-card\"><a href=\"https://todon.eu/@goosebot\" class=\"u-url mention\">@<span>goosebot</span></a></span><br />git: <a href=\"https://git.blast.noho.st/mouse\" rel=\"nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">git.blast.noho.st/mouse</span><span class=\"invisible\"></span></a></p><p>want to trade chapbooks or zines? hmu!</p><p>he/him or they/them</p>")
+     (url . "https://todon.nl/@mousebot")
+     (avatar . "https://todon.nl/system/accounts/avatars/000/242/971/original/0a5e801576af597b.jpg")
+     (avatar_static . "https://todon.nl/system/accounts/avatars/000/242/971/original/0a5e801576af597b.jpg")
+     (header . "https://todon.nl/system/accounts/headers/000/242/971/original/f85f7f1048237fd4.jpg")
+     (header_static . "https://todon.nl/system/accounts/headers/000/242/971/original/f85f7f1048237fd4.jpg")
+     (followers_count . 226)
+     (following_count . 634)
+     (statuses_count . 3807)
+     (last_status_at . "2021-11-05")
+     (emojis .
+             [])
+     (fields .
+             [((name . "dark to")
+               (value . "themselves")
+               (verified_at))
+              ((name . "its raining")
+               (value . "plastic")
+               (verified_at))
+              ((name . "dis")
+               (value . "integration")
+               (verified_at))
+              ((name . "ungleichzeitigkeit und")
+               (value . "gleichzeitigkeit, philosophisch")
+               (verified_at))]))
+    (media_attachments .
+                       [])
+    (mentions .
+              [((id . "242971")
+                (username . "mousebot")
+                (url . "https://todon.nl/@mousebot")
+                (acct . "mousebot"))])
+    (tags .
+          [])
+    (emojis .
+            [])
+    (card)
+    (poll)))
+
+(ert-deftest mastodon-search-test-get-user-info-@ ()
+  "Should build a list from a single account for company completion."
+  (let ((account mastodon-search--single-account-query))
+    (should (equal (mastodon-search--get-user-info-@ account)
+                   '(": ( ) { : | : & } ; :" "@mousebot" "https://todon.nl/@mousebot")))))
+
+(ert-deftest mastodon-search-test-get-user-info ()
+  "Should build a list from a single account for company completion."
+  (let ((account mastodon-search--single-account-query))
+    (should (equal (mastodon-search--get-user-info account)
+                   '(": ( ) { : | : & } ; :" "mousebot" "https://todon.nl/@mousebot")))))
+
+(ert-deftest mastodon-search-test-get-hashtag-info ()
+  "Should build a list of hashtag name and URL."
+  (let ((tag mastodon-search-test-single-tag))
+    (should (equal (mastodon-search--get-hashtag-info tag)
+                   '("TeamBringBackVisibleScrollbars"
+                     "https://todon.nl/tags/TeamBringBackVisibleScrollbars")))))
+
+(ert-deftest mastodon-search-test-get-status-info ()
+  "Should return a list of ID, timestamp, content, and spoiler."
+  (let ((status mastodon-search-test-single-status))
+    (should (equal (mastodon-search--get-status-info status)
+                   '("107230316503209282"
+                     "2021-11-06T13:19:40.628Z"
+                     ""
+                     "<p>This is a nice test toot, for testing purposes. Thank you.</p>")))))
-- 
cgit v1.2.3


From 93950dbee4165c733fd8e0a4938fd7d0f462d908 Mon Sep 17 00:00:00 2001
From: Holger Dürer <me@hdurer.net>
Date: Tue, 2 Nov 2021 20:30:27 +0100
Subject: Reformat all code.

Basically, in Emacs for each file: select all text and
`indent-region`.

- This also removes one redundant comment, and
- fixes an error with json decoding where the `json-read-from-string`
  was actually not within the intended `unless` clause (which explains
  the warning about "result of (string-equal "" json-string) will be
  ignored" which I never understood.
---
 lisp/mastodon-async.el              |  22 +-
 lisp/mastodon-http.el               |  87 ++++----
 lisp/mastodon-inspect.el            |   2 +-
 lisp/mastodon-media.el              |   4 +-
 lisp/mastodon-notifications.el      |  68 +++---
 lisp/mastodon-profile.el            |  24 +--
 lisp/mastodon-search.el             |  78 +++----
 lisp/mastodon-tl.el                 |  54 ++---
 lisp/mastodon-toot.el               | 106 ++++-----
 lisp/mastodon.el                    |   4 +-
 test/mastodon-auth-tests.el         |  14 +-
 test/mastodon-client-tests.el       |  64 +++---
 test/mastodon-http-tests.el         |   6 +-
 test/mastodon-media-tests.el        | 266 +++++++++++------------
 test/mastodon-notifications-test.el |   4 +-
 test/mastodon-tl-tests.el           | 420 ++++++++++++++++++------------------
 test/mastodon-toot-tests.el         |   6 +-
 17 files changed, 614 insertions(+), 615 deletions(-)

(limited to 'test')

diff --git a/lisp/mastodon-async.el b/lisp/mastodon-async.el
index f7bbdff..1fabee2 100644
--- a/lisp/mastodon-async.el
+++ b/lisp/mastodon-async.el
@@ -59,10 +59,10 @@
   "The intermediate queue buffer name.")
 
 (defvar-local mastodon-async--buffer "" ;;"*mastodon-async-buffer*"
-   "User facing output buffer name.")
+  "User facing output buffer name.")
 
 (defvar-local mastodon-async--http-buffer "" ;;""
-   "Buffer variable bound to http output.")
+  "Buffer variable bound to http output.")
 
 (defun mastodon-async--display-http ()
   "Display the async HTTP input buffer."
@@ -177,16 +177,16 @@ is not known when `mastodon-async--setup-buffer' is called."
 
 NAME is used to generate the display buffer and the queue."
   (let ((queue-name (concat " *mastodon-async-queue-" name "-"
-                           mastodon-instance-url "*"))
+                            mastodon-instance-url "*"))
         (buffer-name (concat "*mastodon-async-display-" name "-"
-                            mastodon-instance-url "*")))
+                             mastodon-instance-url "*")))
     (mastodon-async--set-local-variables http-buffer http-buffer
                                          buffer-name queue-name)))
 
 (defun mastodon-async--setup-queue (http-buffer name)
   "Sets up the buffer for the async queue."
   (let ((queue-name (concat " *mastodon-async-queue-" name "-"
-                           mastodon-instance-url "*"))
+                            mastodon-instance-url "*"))
         (buffer-name(concat "*mastodon-async-display-" name "-"
                             mastodon-instance-url "*")))
     (mastodon-async--set-local-variables queue-name http-buffer
@@ -203,8 +203,8 @@ ENPOINT is the endpoint for the stream and timeline."
                             mastodon-instance-url "*"))
         (buffer-name (concat "*mastodon-async-display-" name "-"
                              mastodon-instance-url "*"))
-      ;; if user stream, we need "timelines/home" not "timelines/user"
-      ;; if notifs, we need "notifications" not "timelines/notifications"
+        ;; if user stream, we need "timelines/home" not "timelines/user"
+        ;; if notifs, we need "notifications" not "timelines/notifications"
         (endpoint (if (equal name "notifications") "notifications"
                     (if (equal name "home") "timelines/home"
                       (format "timelines/%s" endpoint)))))
@@ -285,8 +285,8 @@ Filter the toots using FILTER."
   ;; NB notification events in streams include follow requests
   (let* ((split-strings (split-string string "\n" t))
          (event-type (replace-regexp-in-string
-                     "^event: " ""
-                     (car split-strings)))
+                      "^event: " ""
+                      (car split-strings)))
          (data (replace-regexp-in-string
                 "^data: " "" (cadr split-strings))))
     (when (equal "notification" event-type)
@@ -304,8 +304,8 @@ Filter the toots using FILTER."
 (defun mastodon-async--account-local-p (json)
   "Test JSON to see if account is local."
   (not (string-match-p
-       "@"
-       (cdr (assoc 'acct (cdr (assoc 'account json)))))))
+        "@"
+        (cdr (assoc 'acct (cdr (assoc 'account json)))))))
 
 (defun mastodon-async--output-toot (toot)
   "Process TOOT and prepend it to the async user-facing buffer."
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 875e9bf..a183ed7 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -153,8 +153,8 @@ is available we will call it with or without a timeout."
           (buffer-substring-no-properties (point) (point-max))
           'utf-8)))
     (kill-buffer)
-    (unless (or (string-equal "" json-string) (null json-string)))
-        (json-read-from-string json-string)))
+    (unless (or (string-equal "" json-string) (null json-string))
+      (json-read-from-string json-string))))
 
 (defun mastodon-http--delete (url)
   "Make DELETE request to URL."
@@ -256,8 +256,8 @@ Authorization header is included by default unless UNAUTHENTICED-P is non-nil."
                       args
                       "&")))
         (url-request-extra-headers
-	     (append `(("Authorization" . ,(concat "Bearer " (mastodon-auth--access-token))))
-	             headers)))
+	 (append `(("Authorization" . ,(concat "Bearer " (mastodon-auth--access-token))))
+	         headers)))
     (with-temp-buffer
       (url-retrieve url callback cbargs))))
 
@@ -269,46 +269,45 @@ The upload is asynchronous. On succeeding,
 item uploaded, and `mastodon-toot--update-status-fields' is run."
   (let* ((file (file-name-nondirectory filename))
          (request-backend 'curl))
-         ;; (response
-         (request
-            url
-            :type "POST"
-            :params `(("description" . ,caption))
-            :files `(("file" . (,file :file ,filename
-                                      :mime-type "multipart/form-data")))
-            :parser 'json-read
-            :headers `(("Authorization" . ,(concat "Bearer "
-                                                   (mastodon-auth--access-token))))
-            :sync t
-            :success (cl-function
-                      (lambda (&key data &allow-other-keys)
-                        (when data
-                          (progn
-                            (push (cdr (assoc 'id data))
-                                  mastodon-toot--media-attachment-ids) ; add ID to list
-                            (message "%s file %s with id %S and caption '%s' uploaded!"
-                                     (capitalize (cdr (assoc 'type data)))
-                                     file
-                                     (cdr (assoc 'id data))
-                                     (cdr (assoc 'description data)))
-                            (mastodon-toot--update-status-fields)))))
-            :error (cl-function
-                    (lambda (&key error-thrown &allow-other-keys)
-                      (cond
-                       ;; handle curl errors first (eg 26, can't read file/path)
-                       ;; because the '=' test below fails for them
-                       ;; they have the form (error . error message 24)
-                       ((not (proper-list-p error-thrown)) ; not dotted list
-			            (message "Got error: %s. Shit went south." (cdr error-thrown)))
-                       ;; handle mastodon api errors
-                       ;; they have the form (error http 401)
-			           ((= (car (last error-thrown)) 401)
-                        (message "Got error: %s Unauthorized: The access token is invalid" error-thrown))
-                       ((= (car (last error-thrown)) 422)
-                        (message "Got error: %s Unprocessable entity: file or file type is unsupported or invalid" error-thrown))
-                       (t
-                        (message "Got error: %s Shit went south"
-                                 error-thrown))))))))
+    (request
+     url
+     :type "POST"
+     :params `(("description" . ,caption))
+     :files `(("file" . (,file :file ,filename
+                               :mime-type "multipart/form-data")))
+     :parser 'json-read
+     :headers `(("Authorization" . ,(concat "Bearer "
+                                            (mastodon-auth--access-token))))
+     :sync t
+     :success (cl-function
+               (lambda (&key data &allow-other-keys)
+                 (when data
+                   (progn
+                     (push (cdr (assoc 'id data))
+                           mastodon-toot--media-attachment-ids) ; add ID to list
+                     (message "%s file %s with id %S and caption '%s' uploaded!"
+                              (capitalize (cdr (assoc 'type data)))
+                              file
+                              (cdr (assoc 'id data))
+                              (cdr (assoc 'description data)))
+                     (mastodon-toot--update-status-fields)))))
+     :error (cl-function
+             (lambda (&key error-thrown &allow-other-keys)
+               (cond
+                ;; handle curl errors first (eg 26, can't read file/path)
+                ;; because the '=' test below fails for them
+                ;; they have the form (error . error message 24)
+                ((not (proper-list-p error-thrown)) ; not dotted list
+		 (message "Got error: %s. Shit went south." (cdr error-thrown)))
+                ;; handle mastodon api errors
+                ;; they have the form (error http 401)
+		((= (car (last error-thrown)) 401)
+                 (message "Got error: %s Unauthorized: The access token is invalid" error-thrown))
+                ((= (car (last error-thrown)) 422)
+                 (message "Got error: %s Unprocessable entity: file or file type is unsupported or invalid" error-thrown))
+                (t
+                 (message "Got error: %s Shit went south"
+                          error-thrown))))))))
 
 (provide 'mastodon-http)
 ;;; mastodon-http.el ends here
diff --git a/lisp/mastodon-inspect.el b/lisp/mastodon-inspect.el
index 2181ea2..4647335 100644
--- a/lisp/mastodon-inspect.el
+++ b/lisp/mastodon-inspect.el
@@ -59,7 +59,7 @@
    (concat "*mastodon-inspect-toot-"
            (mastodon-tl--as-string (mastodon-tl--property 'toot-id))
            "*")
-  (mastodon-tl--property 'toot-json)))
+   (mastodon-tl--property 'toot-json)))
 
 (defun mastodon-inspect--download-single-toot (toot-id)
   "Download the toot/status represented by TOOT-ID."
diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index 5f8f46c..f7386c6 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -161,7 +161,7 @@ with the image."
                                  t image-options))))
             (when mastodon-media--enable-image-caching
               (unless (url-is-cached url) ; cache if not already cached
-              (url-store-in-cache url-buffer)))
+                (url-store-in-cache url-buffer)))
             (with-current-buffer (marker-buffer marker)
               ;; Save narrowing in our buffer
               (let ((inhibit-read-only t))
@@ -239,7 +239,7 @@ found."
          ;; Avatars are just one character in the buffer
          ((eq media-type 'avatar)
           (list next-pos (+ next-pos 1) 'avatar))
-        ;; Media links are 5 character ("[img]")
+         ;; Media links are 5 character ("[img]")
          ((eq media-type 'media-link)
           (list next-pos (+ next-pos 5) 'media-link)))))))
 
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index 36f9d4a..2430bcc 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -80,23 +80,23 @@
     (let* ((toot-json (mastodon-tl--property 'toot-json))
            (f-req-p (string= "follow_request" (cdr (assoc 'type toot-json)))))
       (if f-req-p
-        (let* ((account (cdr (assoc 'account toot-json)))
-               (id (cdr (assoc 'id account)))
-               (handle (cdr (assoc 'acct account)))
-               (name (cdr (assoc 'username account))))
-          (if id
-              (let ((response
-                     (mastodon-http--post
-                      (concat
-                       (mastodon-http--api "follow_requests")
-                       (format "/%s/authorize" id))
-                      nil nil)))
-                (mastodon-http--triage response
-                                       (lambda ()
-                                         (mastodon-notifications--get)
-                                         (message "Follow request of %s (@%s) accepted!"
-                                                  name handle))))
-            (message "No account result at point?")))
+          (let* ((account (cdr (assoc 'account toot-json)))
+                 (id (cdr (assoc 'id account)))
+                 (handle (cdr (assoc 'acct account)))
+                 (name (cdr (assoc 'username account))))
+            (if id
+                (let ((response
+                       (mastodon-http--post
+                        (concat
+                         (mastodon-http--api "follow_requests")
+                         (format "/%s/authorize" id))
+                        nil nil)))
+                  (mastodon-http--triage response
+                                         (lambda ()
+                                           (mastodon-notifications--get)
+                                           (message "Follow request of %s (@%s) accepted!"
+                                                    name handle))))
+              (message "No account result at point?")))
         (message "No follow request at point?")))))
 
 (defun mastodon-notifications--follow-request-reject-notifs ()
@@ -106,23 +106,23 @@
     (let* ((toot-json (mastodon-tl--property 'toot-json))
            (f-req-p (string= "follow_request" (cdr (assoc 'type toot-json)))))
       (if f-req-p
-        (let* ((account (cdr (assoc 'account toot-json)))
-               (id (cdr (assoc 'id account)))
-               (handle (cdr (assoc 'acct account)))
-               (name (cdr (assoc 'username account))))
-          (if id
-              (let ((response
-                     (mastodon-http--post
-                      (concat
-                       (mastodon-http--api "follow_requests")
-                       (format "/%s/reject" id))
-                      nil nil)))
-                (mastodon-http--triage response
-                                       (lambda ()
-                                         (mastodon-notifications--get)
-                                         (message "Follow request of %s (@%s) rejected!"
-                                                  name handle))))
-            (message "No account result at point?")))
+          (let* ((account (cdr (assoc 'account toot-json)))
+                 (id (cdr (assoc 'id account)))
+                 (handle (cdr (assoc 'acct account)))
+                 (name (cdr (assoc 'username account))))
+            (if id
+                (let ((response
+                       (mastodon-http--post
+                        (concat
+                         (mastodon-http--api "follow_requests")
+                         (format "/%s/reject" id))
+                        nil nil)))
+                  (mastodon-http--triage response
+                                         (lambda ()
+                                           (mastodon-notifications--get)
+                                           (message "Follow request of %s (@%s) rejected!"
+                                                    name handle))))
+              (message "No account result at point?")))
         (message "No follow request at point?")))))
 
 (defun mastodon-notifications--mention (note)
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 31499ed..b68be6f 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -256,20 +256,20 @@ Returns a list of lists."
   (let* ((car-fields (mapcar 'car fields))
          ;; (cdr-fields (mapcar 'cadr fields))
          ;; (cdr-fields-rendered
-          ;; (list
-           ;; (mapcar (lambda (x)
-                     ;; (mastodon-tl--render-text x nil))
-                   ;; cdr-fields)))
+         ;; (list
+         ;; (mapcar (lambda (x)
+         ;; (mastodon-tl--render-text x nil))
+         ;; cdr-fields)))
          (left-width (car (sort (mapcar 'length car-fields) '>))))
-         ;; (right-width (car (sort (mapcar 'length cdr-fields) '>))))
+    ;; (right-width (car (sort (mapcar 'length cdr-fields) '>))))
     (mapconcat (lambda (field)
                  (mastodon-tl--render-text
                   (concat
                    (format "_ %s " (car field))
                    (make-string (- (+ 1 left-width) (length (car field))) ?_)
                    (format " :: %s" (cadr field)))
-                   ;; (make-string (- (+ 1 right-width) (length (cdr field))) ?_)
-                   ;; " |")
+                  ;; (make-string (- (+ 1 right-width) (length (cdr field))) ?_)
+                  ;; " |")
                   field)) ; nil)) ; hack to make links tabstops
                fields "")))
 
@@ -307,7 +307,7 @@ Returns a list of lists."
                         account 'statuses_count)))
          (relationships (mastodon-profile--relationships-get id))
          (followed-by-you (cdr (assoc 'following
-                                  (aref relationships 0))))
+                                      (aref relationships 0))))
          (follows-you (cdr (assoc 'followed_by
                                   (aref relationships 0))))
          (followsp (or (equal follows-you 't) (equal followed-by-you 't)))
@@ -327,9 +327,9 @@ Returns a list of lists."
              (is-followers (string= endpoint-type "followers"))
              (is-following (string= endpoint-type "following"))
              (endpoint-name (cond
-                              (is-statuses "     TOOTS   ")
-                              (is-followers "  FOLLOWERS  ")
-                              (is-following "  FOLLOWING  "))))
+                             (is-statuses "     TOOTS   ")
+                             (is-followers "  FOLLOWERS  ")
+                             (is-following "  FOLLOWING  "))))
         (insert
          "\n"
          (mastodon-profile--image-from-account account)
@@ -382,7 +382,7 @@ Returns a list of lists."
           'success))
         (setq mastodon-tl--update-point (point))
         (mastodon-media--inline-images (point-min) (point))
-         ;; insert pinned toots first
+        ;; insert pinned toots first
         (when (and pinned (equal endpoint-type "statuses"))
           (mastodon-profile--insert-statuses-pinned pinned)
           (setq mastodon-tl--update-point (point))) ;updates to follow pinned toots
diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index 5f52bb7..cbb452d 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -80,7 +80,7 @@ Returns a nested list containing user handle, display name, and URL."
          (tags-list (mapcar #'mastodon-search--get-hashtag-info
                             tags))
          ;; (status-list (mapcar #'mastodon-search--get-status-info
-                              ;; statuses))
+         ;; statuses))
          (status-ids-list (mapcar 'mastodon-search--get-id-from-status
                                   statuses))
          (toots-list-json (mapcar #'mastodon-search--fetch-full-status-from-id
@@ -97,42 +97,42 @@ Returns a nested list containing user handle, display name, and URL."
                          " ------------\n\n")
                  'success))
         (mapc (lambda (el)
-              (insert (propertize (car el) 'face 'mastodon-display-name-face)
-                      " : \n : "
-                      (propertize (concat "@" (car (cdr el)))
-                                  'face 'mastodon-handle-face
-                                  'mouse-face 'highlight
-		                  'mastodon-tab-stop 'user-handle
-		                  'keymap mastodon-tl--link-keymap
-                                  'mastodon-handle (concat "@" (car (cdr el)))
-		                  'help-echo (concat "Browse user profile of @" (car (cdr el))))
-                      " : \n"
-                      "\n"))
-            user-ids)
-      ;; hashtag results:
-      (insert (mastodon-tl--set-face
-               (concat "\n ------------\n"
-                       " HASHTAGS\n"
-                       " ------------\n\n")
-               'success))
-      (mapc (lambda (el)
-              (insert " : #"
-                      (propertize (car el)
-                                  'mouse-face 'highlight
-                                  'mastodon-tag (car el)
-                                  'mastodon-tab-stop 'hashtag
-                                  'help-echo (concat "Browse tag #" (car el))
-                                  'keymap mastodon-tl--link-keymap)
-                      " : \n\n"))
-            tags-list)
-      ;; status results:
-      (insert (mastodon-tl--set-face
-               (concat "\n ------------\n"
-                       " STATUSES\n"
-                       " ------------\n")
-               'success))
-      (mapc 'mastodon-tl--toot toots-list-json)
-      (goto-char (point-min))))))
+                (insert (propertize (car el) 'face 'mastodon-display-name-face)
+                        " : \n : "
+                        (propertize (concat "@" (car (cdr el)))
+                                    'face 'mastodon-handle-face
+                                    'mouse-face 'highlight
+		                    'mastodon-tab-stop 'user-handle
+		                    'keymap mastodon-tl--link-keymap
+                                    'mastodon-handle (concat "@" (car (cdr el)))
+		                    'help-echo (concat "Browse user profile of @" (car (cdr el))))
+                        " : \n"
+                        "\n"))
+              user-ids)
+        ;; hashtag results:
+        (insert (mastodon-tl--set-face
+                 (concat "\n ------------\n"
+                         " HASHTAGS\n"
+                         " ------------\n\n")
+                 'success))
+        (mapc (lambda (el)
+                (insert " : #"
+                        (propertize (car el)
+                                    'mouse-face 'highlight
+                                    'mastodon-tag (car el)
+                                    'mastodon-tab-stop 'hashtag
+                                    'help-echo (concat "Browse tag #" (car el))
+                                    'keymap mastodon-tl--link-keymap)
+                        " : \n\n"))
+              tags-list)
+        ;; status results:
+        (insert (mastodon-tl--set-face
+                 (concat "\n ------------\n"
+                         " STATUSES\n"
+                         " ------------\n")
+                 'success))
+        (mapc 'mastodon-tl--toot toots-list-json)
+        (goto-char (point-min))))))
 
 (defun mastodon-search--get-user-info (account)
   "Get user handle, display name and account URL from ACCOUNT."
@@ -153,7 +153,7 @@ Returns a nested list containing user handle, display name, and URL."
         (cdr (assoc 'content status))))
 
 (defun mastodon-search--get-id-from-status (status)
-    "Fetch the id from a STATUS returned by a search call to the server.
+  "Fetch the id from a STATUS returned by a search call to the server.
 
 We use this to fetch the complete status from the server."
   (cdr (assoc 'id status)))
@@ -164,7 +164,7 @@ We use this to fetch the complete status from the server."
 This allows us to access the full account etc. details and to
 render them properly."
   (let* ((url (concat mastodon-instance-url "/api/v1/statuses/" (mastodon-tl--as-string id)))
-        (json (mastodon-http--get-json url)))
+         (json (mastodon-http--get-json url)))
     json))
 
 (provide 'mastodon-search)
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index e4c179c..d300a09 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -91,10 +91,10 @@ width fonts when rendering HTML text"))
   :type '(boolean :tag "Whether to display user avatars in timelines"))
 
 ;; (defvar mastodon-tl--show-avatars nil
-        ;; (if (version< emacs-version "27.1")
-            ;; (image-type-available-p 'imagemagick)
-          ;; (image-transforms-p))
-  ;; "A boolean value stating whether to show avatars in timelines.")
+;; (if (version< emacs-version "27.1")
+;; (image-type-available-p 'imagemagick)
+;; (image-transforms-p))
+;; "A boolean value stating whether to show avatars in timelines.")
 
 (defvar-local mastodon-tl--update-point nil
   "When updating a mastodon buffer this is where new toots will be inserted.
@@ -463,7 +463,7 @@ START and END are the boundaries of the link in the toot."
          (url-instance (concat "https://"
                                (url-host (url-generic-parse-url url))))
          (maybe-userhandle (if (string= mastodon-instance-url url-instance)
-                               ; if handle is local, then no instance suffix:
+                                        ; if handle is local, then no instance suffix:
                                (buffer-substring-no-properties start end)
                              (mastodon-tl--extract-userhandle-from-url
                               url (buffer-substring-no-properties start end)))))
@@ -652,12 +652,12 @@ message is a link which unhides/hides the main body."
                    (mastodon-tl--render-text spoiler toot))
                   'default))
          (message (concat ;"\n"
-                          " ---------------\n"
-                          " " (mastodon-tl--make-link
-                               (concat "CW: " string)
-                                                      'content-warning)
-                          "\n"
-                          " ---------------\n"))
+                   " ---------------\n"
+                   " " (mastodon-tl--make-link
+                        (concat "CW: " string)
+                        'content-warning)
+                   "\n"
+                   " ---------------\n"))
          (cw (mastodon-tl--set-face message 'mastodon-cw-face)))
     (concat
      cw
@@ -747,10 +747,10 @@ takes a single function. By default it is
     (concat "Poll: \n\n"
             (mapconcat (lambda (option)
                          (progn
-                         (format "Option %s: %s, %s votes.\n"
-                                 (setq option-counter (1+ option-counter))
-                                 (cdr (assoc 'title option))
-                                 (cdr (assoc 'votes_count option)))))
+                           (format "Option %s: %s, %s votes.\n"
+                                   (setq option-counter (1+ option-counter))
+                                   (cdr (assoc 'title option))
+                                   (cdr (assoc 'votes_count option)))))
                        options
                        "\n") "\n")))
 
@@ -764,8 +764,8 @@ takes a single function. By default it is
                      (mastodon-tl--field 'poll toot)))
            (options (mastodon-tl--field 'options poll))
            (options-titles (mapcar (lambda (x)
-                                   (cdr (assoc 'title x)))
-                                 options))
+                                     (cdr (assoc 'title x)))
+                                   options))
            (options-number-seq (number-sequence 1 (length options)))
            (options-numbers (mapcar (lambda(x)
                                       (number-to-string x))
@@ -775,16 +775,16 @@ takes a single function. By default it is
            ;; but also store both as cons cell as cdr, as we need it below
            (candidates (mapcar (lambda (cell)
                                  (cons (format "%s | %s" (car cell) (cdr cell))
-                                        cell))
+                                       cell))
                                options-alist)))
       (if (null (mastodon-tl--field 'poll (mastodon-tl--property 'toot-json)))
           (message "No poll here.")
         ;; var "option" = just the cdr, a cons of option number and desc
         (cdr (assoc
               (completing-read "Poll option to vote for: "
-                         candidates
-                         nil ; (predicate)
-                         t) ; require match
+                               candidates
+                               nil ; (predicate)
+                               t) ; require match
               candidates))))))
   (if (null (mastodon-tl--field 'poll (mastodon-tl--property 'toot-json)))
       (message "No poll here.")
@@ -961,7 +961,7 @@ webapp"
                        nil ; predicate
                        'confirm))))
   (let* ((account (mastodon-profile--lookup-account-in-status
-                  user-handle (mastodon-profile--toot-json)))
+                   user-handle (mastodon-profile--toot-json)))
          (user-id (mastodon-profile--account-field account 'id))
          (name (mastodon-profile--account-field account 'display_name))
          (url (mastodon-http--api (format "accounts/%s/follow" user-id))))
@@ -983,7 +983,7 @@ webapp"
                        nil ; predicate
                        'confirm))))
   (let* ((account (mastodon-profile--lookup-account-in-status
-                  user-handle (mastodon-profile--toot-json)))
+                   user-handle (mastodon-profile--toot-json)))
          (user-id (mastodon-profile--account-field account 'id))
          (name (mastodon-profile--account-field account 'display_name))
          (url (mastodon-http--api (format "accounts/%s/unfollow" user-id))))
@@ -1006,7 +1006,7 @@ webapp"
                        nil ; predicate
                        'confirm))))
   (let* ((account (mastodon-profile--lookup-account-in-status
-                  user-handle (mastodon-profile--toot-json)))
+                   user-handle (mastodon-profile--toot-json)))
          (user-id (mastodon-profile--account-field account 'id))
          (name (mastodon-profile--account-field account 'display_name))
          (url (mastodon-http--api (format "accounts/%s/mute" user-id))))
@@ -1026,7 +1026,7 @@ webapp"
            (mutes-json (mastodon-http--get-json mutes-url))
            (muted-accts (mapcar (lambda (muted)
                                   (cdr (assoc 'acct muted)))
-                                  mutes-json)))
+                                mutes-json)))
       (completing-read "Handle of user to unmute: "
                        muted-accts
                        nil ; predicate
@@ -1055,7 +1055,7 @@ webapp"
                        nil ; predicate
                        'confirm))))
   (let* ((account (mastodon-profile--lookup-account-in-status
-                  user-handle (mastodon-profile--toot-json)))
+                   user-handle (mastodon-profile--toot-json)))
          (user-id (mastodon-profile--account-field account 'id))
          (name (mastodon-profile--account-field account 'display_name))
          (url (mastodon-http--api (format "accounts/%s/block" user-id))))
@@ -1074,7 +1074,7 @@ webapp"
     (let* ((blocks-url (mastodon-http--api (format "blocks")))
            (blocks-json (mastodon-http--get-json blocks-url))
            (blocked-accts (mapcar (lambda (blocked)
-                                  (cdr (assoc 'acct blocked)))
+                                    (cdr (assoc 'acct blocked)))
                                   blocks-json)))
       (completing-read "Handle of user to unblock: "
                        blocked-accts
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 07b52e3..22eb626 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -184,9 +184,9 @@ Remove MARKER if REMOVE is non-nil, otherwise add it."
   "Take ACTION on toot at point, then execute CALLBACK."
   (let* ((id (mastodon-tl--property 'base-toot-id))
          (url (mastodon-http--api (concat "statuses/"
-                                         (mastodon-tl--as-string id)
-                                         "/"
-                                         action))))
+                                          (mastodon-tl--as-string id)
+                                          "/"
+                                          action))))
     (let ((response (mastodon-http--post url nil nil)))
       (mastodon-http--triage response callback))))
 
@@ -312,7 +312,7 @@ Remove MARKER if REMOVE is non-nil, otherwise add it."
                (with-current-buffer response
                  (let* ((json-response (mastodon-http--process-json))
                         (content (cdr (assoc 'text json-response))))
-                        ;; (media (cdr (assoc 'media_attachments json-response))))
+                   ;; (media (cdr (assoc 'media_attachments json-response))))
                    (mastodon-toot--compose-buffer nil nil)
                    (goto-char (point-max))
                    (insert content)
@@ -338,8 +338,8 @@ Remove MARKER if REMOVE is non-nil, otherwise add it."
                      (format "Toot already bookmarked. Remove? ")
                    (format "Bookmark this toot? ")))
          (message (if (equal bookmarked t)
-                       "Bookmark removed!"
-                     "Toot bookmarked!")))
+                      "Bookmark removed!"
+                    "Toot bookmarked!")))
     (when (y-or-n-p prompt)
       (let ((response (mastodon-http--post url nil nil)))
         (mastodon-http--triage response
@@ -496,10 +496,10 @@ eg. \"feduser@fed.social\" -> \"feduser@fed.social\"."
   "Extract mentions from STATUS and process them into a string."
   (interactive)
   (let* ((boosted (mastodon-tl--field 'reblog status))
-        (mentions
-         (if boosted
-             (cdr (assoc 'mentions (cdr (assoc 'reblog status))))
-           (cdr (assoc 'mentions status)))))
+         (mentions
+          (if boosted
+              (cdr (assoc 'mentions (cdr (assoc 'reblog status))))
+            (cdr (assoc 'mentions status)))))
     (mapconcat (lambda(x) (mastodon-toot--process-local
                            (cdr (assoc 'acct x))))
                ;; reverse does not work on vectors in 24.5
@@ -534,19 +534,19 @@ The prefix can match against both user handles and display names."
 
 (defun mastodon-toot--mentions-completion (command &optional arg &rest ignored)
   "A company completion backend for toot mentions."
-   (interactive (list 'interactive))
-   (cl-case command
-     (interactive (company-begin-backend 'mastodon-toot--mentions-completion))
-     (prefix (when (and (bound-and-true-p mastodon-toot-mode) ; if masto toot minor mode
-                        (save-excursion
-                          (forward-whitespace -1)
-                          (forward-whitespace 1)
-                          (looking-at "@")))
-               ;; @ + thing before point
-               (concat "@" (company-grab-symbol))))
-     (candidates (mastodon-toot--mentions-company-candidates arg))
-     (annotation (mastodon-toot--mentions-company-annotation arg))
-     (meta (mastodon-toot--mentions-company-meta arg))))
+  (interactive (list 'interactive))
+  (cl-case command
+    (interactive (company-begin-backend 'mastodon-toot--mentions-completion))
+    (prefix (when (and (bound-and-true-p mastodon-toot-mode) ; if masto toot minor mode
+                       (save-excursion
+                         (forward-whitespace -1)
+                         (forward-whitespace 1)
+                         (looking-at "@")))
+              ;; @ + thing before point
+              (concat "@" (company-grab-symbol))))
+    (candidates (mastodon-toot--mentions-company-candidates arg))
+    (annotation (mastodon-toot--mentions-company-annotation arg))
+    (meta (mastodon-toot--mentions-company-meta arg))))
 
 (defun mastodon-toot--reply ()
   "Reply to toot at `point'."
@@ -803,38 +803,38 @@ REPLY-JSON is the full JSON of the toot being replied to."
   "Update the status fields in the header based on the current state."
   (ignore-errors  ;; called from after-change-functions so let's not leak errors
     (let ((inhibit-read-only t)
-         (header-region (mastodon-tl--find-property-range 'toot-post-header
+          (header-region (mastodon-tl--find-property-range 'toot-post-header
+                                                           (point-min)))
+          (count-region (mastodon-tl--find-property-range 'toot-post-counter
                                                           (point-min)))
-         (count-region (mastodon-tl--find-property-range 'toot-post-counter
+          (visibility-region (mastodon-tl--find-property-range
+                              'toot-post-visibility (point-min)))
+          (nsfw-region (mastodon-tl--find-property-range 'toot-post-nsfw-flag
                                                          (point-min)))
-         (visibility-region (mastodon-tl--find-property-range
-                             'toot-post-visibility (point-min)))
-         (nsfw-region (mastodon-tl--find-property-range 'toot-post-nsfw-flag
-                                                        (point-min)))
-         (cw-region (mastodon-tl--find-property-range 'toot-post-cw-flag
-                                                      (point-min))))
-     (add-text-properties (car count-region) (cdr count-region)
-                          (list 'display
-                                (format "%s/%s characters"
-                                        (- (point-max) (cdr header-region))
-                                        mastodon-toot--max-toot-chars)))
-     (add-text-properties (car visibility-region) (cdr visibility-region)
-                         (list 'display
-                               (format "Visibility: %s"
-                                       (if (equal
-                                            mastodon-toot--visibility
-                                            "private")
-                                           "followers-only"
-                                         mastodon-toot--visibility))))
-     (add-text-properties (car nsfw-region) (cdr nsfw-region)
-                          (list 'display (if mastodon-toot--content-nsfw
-                                             (if mastodon-toot--media-attachments
-                                                 "NSFW" "NSFW (no effect until attachments added)")
-                                           "")
-                                'face 'mastodon-cw-face))
-     (add-text-properties (car cw-region) (cdr cw-region)
-                          (list 'invisible (not mastodon-toot--content-warning)
-                                'face 'mastodon-cw-face)))))
+          (cw-region (mastodon-tl--find-property-range 'toot-post-cw-flag
+                                                       (point-min))))
+      (add-text-properties (car count-region) (cdr count-region)
+                           (list 'display
+                                 (format "%s/%s characters"
+                                         (- (point-max) (cdr header-region))
+                                         mastodon-toot--max-toot-chars)))
+      (add-text-properties (car visibility-region) (cdr visibility-region)
+                           (list 'display
+                                 (format "Visibility: %s"
+                                         (if (equal
+                                              mastodon-toot--visibility
+                                              "private")
+                                             "followers-only"
+                                           mastodon-toot--visibility))))
+      (add-text-properties (car nsfw-region) (cdr nsfw-region)
+                           (list 'display (if mastodon-toot--content-nsfw
+                                              (if mastodon-toot--media-attachments
+                                                  "NSFW" "NSFW (no effect until attachments added)")
+                                            "")
+                                 'face 'mastodon-cw-face))
+      (add-text-properties (car cw-region) (cdr cw-region)
+                           (list 'invisible (not mastodon-toot--content-warning)
+                                 'face 'mastodon-cw-face)))))
 
 (defun mastodon-toot--compose-buffer (reply-to-user reply-to-id &optional reply-json)
   "Create a new buffer to capture text for a new toot.
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index d405bed..826787a 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -204,8 +204,8 @@ Use. e.g. \"%c\" for your locale's date and time format."
                     "favourites"
                     "search"))
          (buffer (cl-some (lambda (el)
-                           (get-buffer (concat "*mastodon-" el "*")))
-                         tls))) ; return first buff that exists
+                            (get-buffer (concat "*mastodon-" el "*")))
+                          tls))) ; return first buff that exists
     (if buffer
         (switch-to-buffer buffer)
       (mastodon-tl--get-home-timeline)
diff --git a/test/mastodon-auth-tests.el b/test/mastodon-auth-tests.el
index 7daa4db..69c34a4 100644
--- a/test/mastodon-auth-tests.el
+++ b/test/mastodon-auth-tests.el
@@ -45,10 +45,10 @@
   "Should generate token and return JSON response."
   (with-temp-buffer
     (with-mock
-      (mock (mastodon-auth--generate-token) => (progn
-                                                  (insert "\n\n{\"access_token\":\"abcdefg\"}")
-                                                  (current-buffer)))
-      (should (equal (mastodon-auth--get-token) '(:access_token "abcdefg"))))))
+     (mock (mastodon-auth--generate-token) => (progn
+                                                (insert "\n\n{\"access_token\":\"abcdefg\"}")
+                                                (current-buffer)))
+     (should (equal (mastodon-auth--get-token) '(:access_token "abcdefg"))))))
 
 (ert-deftest access-token-found ()
   "Should return value in `mastodon-auth--token-alist' if found."
@@ -61,6 +61,6 @@
   (let ((mastodon-instance-url "https://instance.url")
         (mastodon-auth--token nil))
     (with-mock
-      (mock (mastodon-auth--get-token) => '(:access_token "foobaz"))
-      (should (string= (mastodon-auth--access-token) "foobaz"))
-      (should (equal mastodon-auth--token-alist '(("https://instance.url" . "foobaz")))))))
+     (mock (mastodon-auth--get-token) => '(:access_token "foobaz"))
+     (should (string= (mastodon-auth--access-token) "foobaz"))
+     (should (equal mastodon-auth--token-alist '(("https://instance.url" . "foobaz")))))))
diff --git a/test/mastodon-client-tests.el b/test/mastodon-client-tests.el
index dfe175b..d7f750d 100644
--- a/test/mastodon-client-tests.el
+++ b/test/mastodon-client-tests.el
@@ -17,30 +17,30 @@
   "Should return client registration JSON."
   (with-temp-buffer
     (with-mock
-      (mock (mastodon-client--register) => (progn
-                                                   (insert "\n\n{\"foo\":\"bar\"}")
-                                                   (current-buffer)))
-      (should (equal (mastodon-client--fetch) '(:foo "bar"))))))
+     (mock (mastodon-client--register) => (progn
+                                            (insert "\n\n{\"foo\":\"bar\"}")
+                                            (current-buffer)))
+     (should (equal (mastodon-client--fetch) '(:foo "bar"))))))
 
 (ert-deftest store-1 ()
   "Should return the client plist."
   (let ((mastodon-instance-url "http://mastodon.example")
         (plist '(:client_id "id" :client_secret "secret")))
     (with-mock
-      (mock (mastodon-client--token-file) => "stubfile.plstore")
-      (mock (mastodon-client--fetch) => '(:client_id "id" :client_secret "secret"))
-      (let* ((plstore (plstore-open "stubfile.plstore"))
-             (client (cdr (plstore-get plstore "mastodon-http://mastodon.example"))))
-        (should (equal (mastodon-client--store) plist))))))
+     (mock (mastodon-client--token-file) => "stubfile.plstore")
+     (mock (mastodon-client--fetch) => '(:client_id "id" :client_secret "secret"))
+     (let* ((plstore (plstore-open "stubfile.plstore"))
+            (client (cdr (plstore-get plstore "mastodon-http://mastodon.example"))))
+       (should (equal (mastodon-client--store) plist))))))
 
 (ert-deftest store-2 ()
-   "Should store client in `mastodon-client--token-file'."
-   (let* ((mastodon-instance-url "http://mastodon.example")
-          (plstore (plstore-open "stubfile.plstore"))
-          (client (cdr (plstore-get plstore "mastodon-http://mastodon.example"))))
-     (plstore-close plstore)
-     (should (string= (plist-get client :client_id) "id"))
-     (should (string= (plist-get client :client_secret) "secret"))))
+  "Should store client in `mastodon-client--token-file'."
+  (let* ((mastodon-instance-url "http://mastodon.example")
+         (plstore (plstore-open "stubfile.plstore"))
+         (client (cdr (plstore-get plstore "mastodon-http://mastodon.example"))))
+    (plstore-close plstore)
+    (should (string= (plist-get client :client_id) "id"))
+    (should (string= (plist-get client :client_secret) "secret"))))
 
 (ert-deftest read-finds-match ()
   "Should return mastodon client from `mastodon-token-file' if it exists."
@@ -60,8 +60,8 @@
 (ert-deftest read-empty-store ()
   "Should return nil if mastodon client is not present in the plstore."
   (with-mock
-    (mock (mastodon-client--token-file) => "fixture/empty.plstore")
-    (should (equal (mastodon-client--read) nil))))
+   (mock (mastodon-client--token-file) => "fixture/empty.plstore")
+   (should (equal (mastodon-client--read) nil))))
 
 (ert-deftest client-set-and-matching ()
   "Should return `mastondon-client' if `mastodon-client--client-details-alist' is non-nil and instance url is included."
@@ -75,29 +75,29 @@
   (let ((mastodon-instance-url "http://mastodon.example")
         (mastodon-client--client-details-alist '(("http://other.example" :wrong))))
     (with-mock
-      (mock (mastodon-client--read) => '(:client_id "foo" :client_secret "bar"))
-      (should (equal (mastodon-client) '(:client_id "foo" :client_secret "bar")))
-      (should (equal mastodon-client--client-details-alist
-                     '(("http://mastodon.example" :client_id "foo" :client_secret "bar")
-                       ("http://other.example" :wrong)))))))
+     (mock (mastodon-client--read) => '(:client_id "foo" :client_secret "bar"))
+     (should (equal (mastodon-client) '(:client_id "foo" :client_secret "bar")))
+     (should (equal mastodon-client--client-details-alist
+                    '(("http://mastodon.example" :client_id "foo" :client_secret "bar")
+                      ("http://other.example" :wrong)))))))
 
 (ert-deftest client-unset ()
   "Should read from `mastodon-token-file' if available."
   (let ((mastodon-instance-url "http://mastodon.example")
         (mastodon-client--client-details-alist nil))
     (with-mock
-      (mock (mastodon-client--read) => '(:client_id "foo" :client_secret "bar"))
-      (should (equal (mastodon-client) '(:client_id "foo" :client_secret "bar")))
-      (should (equal mastodon-client--client-details-alist
-                     '(("http://mastodon.example" :client_id "foo" :client_secret "bar")))))))
+     (mock (mastodon-client--read) => '(:client_id "foo" :client_secret "bar"))
+     (should (equal (mastodon-client) '(:client_id "foo" :client_secret "bar")))
+     (should (equal mastodon-client--client-details-alist
+                    '(("http://mastodon.example" :client_id "foo" :client_secret "bar")))))))
 
 (ert-deftest client-unset-and-not-in-storage ()
   "Should store client data in plstore if it can't be read."
   (let ((mastodon-instance-url "http://mastodon.example")
         (mastodon-client--client-details-alist nil))
     (with-mock
-      (mock (mastodon-client--read))
-      (mock (mastodon-client--store) => '(:client_id "foo" :client_secret "baz"))
-      (should (equal (mastodon-client) '(:client_id "foo" :client_secret "baz")))
-      (should (equal mastodon-client--client-details-alist
-                     '(("http://mastodon.example" :client_id "foo" :client_secret "baz")))))))
+     (mock (mastodon-client--read))
+     (mock (mastodon-client--store) => '(:client_id "foo" :client_secret "baz"))
+     (should (equal (mastodon-client) '(:client_id "foo" :client_secret "baz")))
+     (should (equal mastodon-client--client-details-alist
+                    '(("http://mastodon.example" :client_id "foo" :client_secret "baz")))))))
diff --git a/test/mastodon-http-tests.el b/test/mastodon-http-tests.el
index d0f715e..03d4f94 100644
--- a/test/mastodon-http-tests.el
+++ b/test/mastodon-http-tests.el
@@ -4,6 +4,6 @@
   "Should make a `url-retrieve' of the given URL."
   (let ((callback-double (lambda () "double")))
     (with-mock
-      (mock (mastodon-http--url-retrieve-synchronously "https://foo.bar/baz"))
-      (mock (mastodon-auth--access-token) => "test-token")
-      (mastodon-http--get "https://foo.bar/baz"))))
+     (mock (mastodon-http--url-retrieve-synchronously "https://foo.bar/baz"))
+     (mock (mastodon-auth--access-token) => "test-token")
+     (mastodon-http--get "https://foo.bar/baz"))))
diff --git a/test/mastodon-media-tests.el b/test/mastodon-media-tests.el
index 20993f9..b537dfe 100644
--- a/test/mastodon-media-tests.el
+++ b/test/mastodon-media-tests.el
@@ -3,143 +3,143 @@
 (ert-deftest mastodon-media:get-avatar-rendering ()
   "Should return text with all expected properties."
   (with-mock
-    (mock (image-type-available-p 'imagemagick) => t)
-    (mock (create-image * (when (version< emacs-version "27.1") 'imagemagick) t :height 123) => :mock-image)
-
-    (let* ((mastodon-media--avatar-height 123)
-           (result (mastodon-media--get-avatar-rendering "http://example.org/img.png"))
-           (result-no-properties (substring-no-properties result))
-           (properties (text-properties-at 0 result)))
-      (should (string= "  " result-no-properties))
-      (should (string= "http://example.org/img.png" (plist-get properties 'media-url)))
-      (should (eq 'needs-loading (plist-get properties 'media-state)))
-      (should (eq 'avatar (plist-get properties 'media-type)))
-      (should (eq :mock-image (plist-get properties 'display))))))
+   (mock (image-type-available-p 'imagemagick) => t)
+   (mock (create-image * (when (version< emacs-version "27.1") 'imagemagick) t :height 123) => :mock-image)
+
+   (let* ((mastodon-media--avatar-height 123)
+          (result (mastodon-media--get-avatar-rendering "http://example.org/img.png"))
+          (result-no-properties (substring-no-properties result))
+          (properties (text-properties-at 0 result)))
+     (should (string= "  " result-no-properties))
+     (should (string= "http://example.org/img.png" (plist-get properties 'media-url)))
+     (should (eq 'needs-loading (plist-get properties 'media-state)))
+     (should (eq 'avatar (plist-get properties 'media-type)))
+     (should (eq :mock-image (plist-get properties 'display))))))
 
 (ert-deftest mastodon-media:get-media-link-rendering ()
   "Should return text with all expected properties."
   (with-mock
-    (mock (create-image * nil t) => :mock-image)
-
-    (let* ((mastodon-media--preview-max-height 123)
-           (result (mastodon-media--get-media-link-rendering "http://example.org/img.png"))
-           (result-no-properties (substring-no-properties result))
-           (properties (text-properties-at 0 result)))
-      (should (string= "[img] " result-no-properties))
-      (should (string= "http://example.org/img.png" (plist-get properties 'media-url)))
-      (should (eq 'needs-loading (plist-get properties 'media-state)))
-      (should (eq 'media-link (plist-get properties 'media-type)))
-      (should (eq :mock-image (plist-get properties 'display))))))
+   (mock (create-image * nil t) => :mock-image)
+
+   (let* ((mastodon-media--preview-max-height 123)
+          (result (mastodon-media--get-media-link-rendering "http://example.org/img.png"))
+          (result-no-properties (substring-no-properties result))
+          (properties (text-properties-at 0 result)))
+     (should (string= "[img] " result-no-properties))
+     (should (string= "http://example.org/img.png" (plist-get properties 'media-url)))
+     (should (eq 'needs-loading (plist-get properties 'media-state)))
+     (should (eq 'media-link (plist-get properties 'media-type)))
+     (should (eq :mock-image (plist-get properties 'display))))))
 
 (ert-deftest mastodon-media:load-image-from-url:avatar-with-imagemagic ()
   "Should make the right call to url-retrieve."
   (let ((url "http://example.org/image.png")
         (mastodon-media--avatar-height 123))
     (with-mock
-      (mock (image-type-available-p 'imagemagick) => t)
-      (mock (create-image
-             *
-             (when (version< emacs-version "27.1") 'imagemagick)
-             t :height 123) => '(image foo))
-      (mock (copy-marker 7) => :my-marker )
-      (mock (url-retrieve
-             url
-             #'mastodon-media--process-image-response
-             `(:my-marker (:height 123) 1 ,url))
-            => :called-as-expected)
-
-      (with-temp-buffer
-        (insert (concat "Start:"
-                        (mastodon-media--get-avatar-rendering "http://example.org/img.png")
-                        ":rest"))
-
-        (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'avatar 7 1)))))))
+     (mock (image-type-available-p 'imagemagick) => t)
+     (mock (create-image
+            *
+            (when (version< emacs-version "27.1") 'imagemagick)
+            t :height 123) => '(image foo))
+     (mock (copy-marker 7) => :my-marker )
+     (mock (url-retrieve
+            url
+            #'mastodon-media--process-image-response
+            `(:my-marker (:height 123) 1 ,url))
+           => :called-as-expected)
+
+     (with-temp-buffer
+       (insert (concat "Start:"
+                       (mastodon-media--get-avatar-rendering "http://example.org/img.png")
+                       ":rest"))
+
+       (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'avatar 7 1)))))))
 
 (ert-deftest mastodon-media:load-image-from-url:avatar-without-imagemagic ()
   "Should make the right call to url-retrieve."
   (let ((url "http://example.org/image.png"))
     (with-mock
-      (mock (image-type-available-p 'imagemagick) => nil)
-      (mock (create-image * nil t) => '(image foo))
-      (mock (copy-marker 7) => :my-marker )
-      (mock (url-retrieve
-             url
-             #'mastodon-media--process-image-response
-             `(:my-marker () 1 ,url))
-            => :called-as-expected)
-
-      (with-temp-buffer
-        (insert (concat "Start:"
-                        (mastodon-media--get-avatar-rendering "http://example.org/img.png")
-                        ":rest"))
-
-        (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'avatar 7 1)))))))
+     (mock (image-type-available-p 'imagemagick) => nil)
+     (mock (create-image * nil t) => '(image foo))
+     (mock (copy-marker 7) => :my-marker )
+     (mock (url-retrieve
+            url
+            #'mastodon-media--process-image-response
+            `(:my-marker () 1 ,url))
+           => :called-as-expected)
+
+     (with-temp-buffer
+       (insert (concat "Start:"
+                       (mastodon-media--get-avatar-rendering "http://example.org/img.png")
+                       ":rest"))
+
+       (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'avatar 7 1)))))))
 
 (ert-deftest mastodon-media:load-image-from-url:media-link-with-imagemagic ()
   "Should make the right call to url-retrieve."
   (let ((url "http://example.org/image.png"))
     (with-mock
-      (mock (image-type-available-p 'imagemagick) => t)
-      (mock (create-image * nil t) => '(image foo))
-      (mock (copy-marker 7) => :my-marker )
-      (mock (url-retrieve
-             "http://example.org/image.png"
-             #'mastodon-media--process-image-response
-             '(:my-marker (:max-height 321) 5 "http://example.org/image.png"))
-            => :called-as-expected)
-      (with-temp-buffer
-        (insert (concat "Start:"
-                        (mastodon-media--get-media-link-rendering url)
-                        ":rest"))
-        (let ((mastodon-media--preview-max-height 321))
-          (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'media-link 7 5))))))))
+     (mock (image-type-available-p 'imagemagick) => t)
+     (mock (create-image * nil t) => '(image foo))
+     (mock (copy-marker 7) => :my-marker )
+     (mock (url-retrieve
+            "http://example.org/image.png"
+            #'mastodon-media--process-image-response
+            '(:my-marker (:max-height 321) 5 "http://example.org/image.png"))
+           => :called-as-expected)
+     (with-temp-buffer
+       (insert (concat "Start:"
+                       (mastodon-media--get-media-link-rendering url)
+                       ":rest"))
+       (let ((mastodon-media--preview-max-height 321))
+         (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'media-link 7 5))))))))
 
 (ert-deftest mastodon-media:load-image-from-url:media-link-without-imagemagic ()
   "Should make the right call to url-retrieve."
   (let ((url "http://example.org/image.png"))
     (with-mock
-      (mock (image-type-available-p 'imagemagick) => nil)
-      (mock (create-image * nil t) => '(image foo))
-      (mock (copy-marker 7) => :my-marker )
-      (mock (url-retrieve
-             "http://example.org/image.png"
-             #'mastodon-media--process-image-response
-             '(:my-marker () 5 "http://example.org/image.png"))
-            => :called-as-expected)
-
-      (with-temp-buffer
-        (insert (concat "Start:"
-                        (mastodon-media--get-avatar-rendering url)
-                        ":rest"))
-        (let ((mastodon-media--preview-max-height 321))
-          (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'media-link 7 5))))))))
+     (mock (image-type-available-p 'imagemagick) => nil)
+     (mock (create-image * nil t) => '(image foo))
+     (mock (copy-marker 7) => :my-marker )
+     (mock (url-retrieve
+            "http://example.org/image.png"
+            #'mastodon-media--process-image-response
+            '(:my-marker () 5 "http://example.org/image.png"))
+           => :called-as-expected)
+
+     (with-temp-buffer
+       (insert (concat "Start:"
+                       (mastodon-media--get-avatar-rendering url)
+                       ":rest"))
+       (let ((mastodon-media--preview-max-height 321))
+         (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'media-link 7 5))))))))
 
 (ert-deftest mastodon-media:load-image-from-url:url-fetching-fails ()
   "Should cope with failures in url-retrieve."
   (let ((url "http://example.org/image.png")
         (mastodon-media--avatar-height 123))
     (with-mock
-      (mock (image-type-available-p 'imagemagick) => t)
-      (mock (create-image
-             *
-             (when (version< emacs-version "27.1") 'imagemagick)
-             t :height 123) => '(image foo))
-      (stub url-retrieve => (error "url-retrieve failed"))
-
-      (with-temp-buffer
-        (insert (concat "Start:"
-                        (mastodon-media--get-avatar-rendering "http://example.org/img.png")
-                        ":rest"))
-
-        (should (eq :loading-failed (mastodon-media--load-image-from-url url 'avatar 7 1)))
-        ;; the media state was updated so we won't load this again: 
-        (should (eq 'loading-failed (get-text-property 7 'media-state)))))))
+     (mock (image-type-available-p 'imagemagick) => t)
+     (mock (create-image
+            *
+            (when (version< emacs-version "27.1") 'imagemagick)
+            t :height 123) => '(image foo))
+     (stub url-retrieve => (error "url-retrieve failed"))
+
+     (with-temp-buffer
+       (insert (concat "Start:"
+                       (mastodon-media--get-avatar-rendering "http://example.org/img.png")
+                       ":rest"))
+
+       (should (eq :loading-failed (mastodon-media--load-image-from-url url 'avatar 7 1)))
+       ;; the media state was updated so we won't load this again: 
+       (should (eq 'loading-failed (get-text-property 7 'media-state)))))))
 
 (ert-deftest mastodon-media:process-image-response ()
   "Should process the HTTP response and adjust the source buffer."
   (with-temp-buffer
     (with-mock
-      (let ((source-buffer (current-buffer))
+     (let ((source-buffer (current-buffer))
            used-marker
            saved-marker)
        (insert "start:")
@@ -175,35 +175,35 @@
 (ert-deftest mastodon-media:inline-images ()
   "Should process all media in buffer."
   (with-mock
-    ;; Stub needed for the test setup:
-    (stub create-image => '(image ignored))
-
-    (let (marker-media-link marker-media-link-bad-url marker-false-media marker-avatar)
-      (with-temp-buffer
-        (insert "Some text before\n")
-        (setq marker-media-link (copy-marker (point)))
-        (insert (mastodon-media--get-media-link-rendering "http://example.org/i.jpg")
-                " some more text ")
-        (setq marker-media-link-bad-url (copy-marker (point)))
-        (insert (mastodon-media--get-media-link-rendering "/files/small/missing.png")
-                " some more text ")
-        (setq marker-false-media (copy-marker (point)))
-        (insert
-         ;; text that looks almost like an avatar but lacks the media-url property
-         (propertize "this won't be processed"
-                     'media-state 'needs-loading
-                     'media-type 'avatar)
-         "even more text ")
-        (setq marker-avatar (copy-marker (point)))
-        (insert (mastodon-media--get-avatar-rendering "http://example.org/avatar.png")
-                " end of text")
-        (goto-char (point-min))
-
-        ;; stub for the actual test:
-        (stub mastodon-media--load-image-from-url)
-        (mastodon-media--inline-images (point-min) (point-max))
-
-        (should (eq 'loading (get-text-property marker-media-link 'media-state)))
-        (should (eq 'invalid-url (get-text-property marker-media-link-bad-url 'media-state)))
-        (should (eq 'loading (get-text-property marker-avatar 'media-state)))
-        (should (eq 'needs-loading (get-text-property marker-false-media 'media-state)))))))
+   ;; Stub needed for the test setup:
+   (stub create-image => '(image ignored))
+
+   (let (marker-media-link marker-media-link-bad-url marker-false-media marker-avatar)
+     (with-temp-buffer
+       (insert "Some text before\n")
+       (setq marker-media-link (copy-marker (point)))
+       (insert (mastodon-media--get-media-link-rendering "http://example.org/i.jpg")
+               " some more text ")
+       (setq marker-media-link-bad-url (copy-marker (point)))
+       (insert (mastodon-media--get-media-link-rendering "/files/small/missing.png")
+               " some more text ")
+       (setq marker-false-media (copy-marker (point)))
+       (insert
+        ;; text that looks almost like an avatar but lacks the media-url property
+        (propertize "this won't be processed"
+                    'media-state 'needs-loading
+                    'media-type 'avatar)
+        "even more text ")
+       (setq marker-avatar (copy-marker (point)))
+       (insert (mastodon-media--get-avatar-rendering "http://example.org/avatar.png")
+               " end of text")
+       (goto-char (point-min))
+
+       ;; stub for the actual test:
+       (stub mastodon-media--load-image-from-url)
+       (mastodon-media--inline-images (point-min) (point-max))
+
+       (should (eq 'loading (get-text-property marker-media-link 'media-state)))
+       (should (eq 'invalid-url (get-text-property marker-media-link-bad-url 'media-state)))
+       (should (eq 'loading (get-text-property marker-avatar 'media-state)))
+       (should (eq 'needs-loading (get-text-property marker-false-media 'media-state)))))))
diff --git a/test/mastodon-notifications-test.el b/test/mastodon-notifications-test.el
index 778d350..3047ae6 100644
--- a/test/mastodon-notifications-test.el
+++ b/test/mastodon-notifications-test.el
@@ -185,8 +185,8 @@
   "Ensure get request format for notifictions is accurate."
   (let ((mastodon-instance-url "https://instance.url"))
     (with-mock
-      (mock (mastodon-http--get-json "https://instance.url/api/v1/notifications" ))
-      (mastodon-notifications--get))))
+     (mock (mastodon-http--get-json "https://instance.url/api/v1/notifications" ))
+     (mastodon-notifications--get))))
 
 (defun mastodon-notifications--test-type (fun sample)
   "Test notification draw functions.
diff --git a/test/mastodon-tl-tests.el b/test/mastodon-tl-tests.el
index 24de5d0..4edf5d5 100644
--- a/test/mastodon-tl-tests.el
+++ b/test/mastodon-tl-tests.el
@@ -114,19 +114,19 @@
 (ert-deftest as-string-1 ()
   "Should accept a string or number and return a string."
   (let ((id "1000"))
-      (should (string= (mastodon-tl--as-string id) id))))
+    (should (string= (mastodon-tl--as-string id) id))))
 
 (ert-deftest as-string-2 ()
   "Should accept a string or number and return a string."
   (let ((id 1000))
-      (should (string= (mastodon-tl--as-string id) (number-to-string id)))))
+    (should (string= (mastodon-tl--as-string id) (number-to-string id)))))
 
 (ert-deftest more-json ()
   "Should request toots older than max_id."
   (let ((mastodon-instance-url "https://instance.url"))
     (with-mock
-      (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?max_id=12345"))
-      (mastodon-tl--more-json "timelines/foo" 12345))))
+     (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?max_id=12345"))
+     (mastodon-tl--more-json "timelines/foo" 12345))))
 
 (ert-deftest more-json-id-string ()
   "Should request toots older than max_id.
@@ -135,8 +135,8 @@
 a string or a numeric."
   (let ((mastodon-instance-url "https://instance.url"))
     (with-mock
-      (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?max_id=12345"))
-      (mastodon-tl--more-json "timelines/foo" "12345"))))
+     (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?max_id=12345"))
+     (mastodon-tl--more-json "timelines/foo" "12345"))))
 
 (ert-deftest update-json-id-string ()
   "Should request toots more recent than since_id.
@@ -145,8 +145,8 @@ a string or a numeric."
 a string or a numeric."
   (let ((mastodon-instance-url "https://instance.url"))
     (with-mock
-      (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?since_id=12345"))
-      (mastodon-tl--updated-json "timelines/foo" "12345"))))
+     (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?since_id=12345"))
+     (mastodon-tl--updated-json "timelines/foo" "12345"))))
 
 (ert-deftest mastodon-tl--relative-time-description ()
   "Should format relative time as expected"
@@ -156,10 +156,10 @@ a string or a numeric."
               (weeks (n) (* n (days 7)))
               (years (n) (* n (days 365)))
               (format-seconds-since (seconds)
-                                    (let ((timestamp (time-subtract (current-time) (seconds-to-time seconds))))
-                                      (mastodon-tl--relative-time-description timestamp)))
+                (let ((timestamp (time-subtract (current-time) (seconds-to-time seconds))))
+                  (mastodon-tl--relative-time-description timestamp)))
               (check (seconds expected)
-                     (should (string= (format-seconds-since seconds) expected))))
+                (should (string= (format-seconds-since seconds) expected))))
     (check 1 "less than a minute ago")
     (check 59 "less than a minute ago")
     (check 60 "one minute ago")
@@ -195,33 +195,33 @@ a string or a numeric."
                 (weeks (n) (* n (days 7)))
                 (years (n) (* n (days 365.25)))
                 (next-update (seconds-ago)
-                             (let* ((timestamp (time-subtract current-time
-                                                              (seconds-to-time seconds-ago))))
-                               (cdr (mastodon-tl--relative-time-details timestamp current-time))))
+                  (let* ((timestamp (time-subtract current-time
+                                                   (seconds-to-time seconds-ago))))
+                    (cdr (mastodon-tl--relative-time-details timestamp current-time))))
                 (check (seconds-ago)
-                       (let* ((timestamp (time-subtract current-time (seconds-to-time seconds-ago)))
-                              (at-now (mastodon-tl--relative-time-description timestamp current-time))
-                              (at-one-second-before (mastodon-tl--relative-time-description
-                                                     timestamp
-                                                     (time-subtract (next-update seconds-ago)
-                                                                    (seconds-to-time 1))))
-                              (at-result (mastodon-tl--relative-time-description
-                                          timestamp
-                                          (next-update seconds-ago))))
-                         (when nil  ;; change to t to debug test failures
-                           (prin1 (format "\nFor %s: %s / %s"
-                                          seconds-ago
-                                          (time-to-seconds
-                                           (time-subtract (next-update seconds-ago)
-                                                          timestamp))
-                                          (round
-                                           (time-to-seconds
-                                            (time-subtract (next-update seconds-ago)
-                                                           current-time))))))
-                         ;; a second earlier the description is the same as at current time
-                         (should (string= at-now at-one-second-before))
-                         ;; but at the result time it is different
-                         (should-not (string= at-one-second-before at-result)))))
+                  (let* ((timestamp (time-subtract current-time (seconds-to-time seconds-ago)))
+                         (at-now (mastodon-tl--relative-time-description timestamp current-time))
+                         (at-one-second-before (mastodon-tl--relative-time-description
+                                                timestamp
+                                                (time-subtract (next-update seconds-ago)
+                                                               (seconds-to-time 1))))
+                         (at-result (mastodon-tl--relative-time-description
+                                     timestamp
+                                     (next-update seconds-ago))))
+                    (when nil  ;; change to t to debug test failures
+                      (prin1 (format "\nFor %s: %s / %s"
+                                     seconds-ago
+                                     (time-to-seconds
+                                      (time-subtract (next-update seconds-ago)
+                                                     timestamp))
+                                     (round
+                                      (time-to-seconds
+                                       (time-subtract (next-update seconds-ago)
+                                                      current-time))))))
+                    ;; a second earlier the description is the same as at current time
+                    (should (string= at-now at-one-second-before))
+                    ;; but at the result time it is different
+                    (should-not (string= at-one-second-before at-result)))))
       (check 0)
       (check 1)
       (check 59)
@@ -253,39 +253,39 @@ a string or a numeric."
   (let ((mastodon-tl--show-avatars-p nil)
         (timestamp (cdr (assoc 'created_at mastodon-tl-test-base-toot))))
     (with-mock
-      (mock (date-to-time timestamp) => '(22782 21551))
-      (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
-
-      (let ((byline (mastodon-tl--byline mastodon-tl-test-base-toot
-                                             'mastodon-tl--byline-author
-                                             'mastodon-tl--byline-boosted))
-	    (handle-location 20))
-	(should (string= (substring-no-properties
-			  byline)
-			 "Account 42 (@acct42@example.space) 2999-99-99 00:11:22
+     (mock (date-to-time timestamp) => '(22782 21551))
+     (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
+
+     (let ((byline (mastodon-tl--byline mastodon-tl-test-base-toot
+                                        'mastodon-tl--byline-author
+                                        'mastodon-tl--byline-boosted))
+	   (handle-location 20))
+       (should (string= (substring-no-properties
+			 byline)
+			"Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
 "))
-	(should (eq (get-text-property handle-location 'mastodon-tab-stop byline)
-                    'user-handle))
-        (should (string= (get-text-property handle-location 'mastodon-handle byline)
-                         "@acct42@example.space"))
-	(should (equal (get-text-property handle-location 'help-echo byline)
-                   "Browse user profile of @acct42@example.space"))))))
+       (should (eq (get-text-property handle-location 'mastodon-tab-stop byline)
+                   'user-handle))
+       (should (string= (get-text-property handle-location 'mastodon-handle byline)
+                        "@acct42@example.space"))
+       (should (equal (get-text-property handle-location 'help-echo byline)
+                      "Browse user profile of @acct42@example.space"))))))
 
 (ert-deftest mastodon-tl--byline-regular-with-avatar ()
   "Should format the regular toot correctly."
   (let ((mastodon-tl--show-avatars-p t)
         (timestamp (cdr (assoc 'created_at mastodon-tl-test-base-toot))))
     (with-mock
-      (stub create-image => '(image "fake data"))
-      (mock (date-to-time timestamp) => '(22782 21551))
-      (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
-
-      (should (string= (substring-no-properties
-                        (mastodon-tl--byline mastodon-tl-test-base-toot
-                                             'mastodon-tl--byline-author
-                                             'mastodon-tl--byline-boosted))
-                       "Account 42 (@acct42@example.space) 2999-99-99 00:11:22
+     (stub create-image => '(image "fake data"))
+     (mock (date-to-time timestamp) => '(22782 21551))
+     (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
+
+     (should (string= (substring-no-properties
+                       (mastodon-tl--byline mastodon-tl-test-base-toot
+                                            'mastodon-tl--byline-author
+                                            'mastodon-tl--byline-boosted))
+                      "Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
 ")))))
 
@@ -295,14 +295,14 @@ a string or a numeric."
          (toot (cons '(reblogged . t) mastodon-tl-test-base-toot))
          (timestamp (cdr (assoc 'created_at toot))))
     (with-mock
-      (mock (date-to-time timestamp) => '(22782 21551))
-      (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
-
-      (should (string= (substring-no-properties
-                        (mastodon-tl--byline toot
-                                             'mastodon-tl--byline-author
-                                             'mastodon-tl--byline-boosted))
-                       "(B) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
+     (mock (date-to-time timestamp) => '(22782 21551))
+     (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
+
+     (should (string= (substring-no-properties
+                       (mastodon-tl--byline toot
+                                            'mastodon-tl--byline-author
+                                            'mastodon-tl--byline-boosted))
+                      "(B) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
 ")))))
 
@@ -312,14 +312,14 @@ a string or a numeric."
          (toot (cons '(favourited . t) mastodon-tl-test-base-toot))
          (timestamp (cdr (assoc 'created_at toot))))
     (with-mock
-      (mock (date-to-time timestamp) => '(22782 21551))
-      (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
-
-      (should (string= (substring-no-properties
-                        (mastodon-tl--byline toot
-                                             'mastodon-tl--byline-author
-                                             'mastodon-tl--byline-boosted))
-                       "(F) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
+     (mock (date-to-time timestamp) => '(22782 21551))
+     (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
+
+     (should (string= (substring-no-properties
+                       (mastodon-tl--byline toot
+                                            'mastodon-tl--byline-author
+                                            'mastodon-tl--byline-boosted))
+                      "(F) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
 ")))))
 
@@ -330,14 +330,14 @@ a string or a numeric."
          (toot `((favourited . t) (reblogged . t) ,@mastodon-tl-test-base-toot))
          (timestamp (cdr (assoc 'created_at toot))))
     (with-mock
-      (mock (date-to-time timestamp) => '(22782 21551))
-      (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
-
-      (should (string= (substring-no-properties
-                        (mastodon-tl--byline toot
-                                             'mastodon-tl--byline-author
-                                             'mastodon-tl--byline-boosted))
-                       "(B) (F) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
+     (mock (date-to-time timestamp) => '(22782 21551))
+     (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
+
+     (should (string= (substring-no-properties
+                       (mastodon-tl--byline toot
+                                            'mastodon-tl--byline-author
+                                            'mastodon-tl--byline-boosted))
+                      "(B) (F) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
 ")))))
 
@@ -349,31 +349,31 @@ a string or a numeric."
          (timestamp (cdr (assoc 'created_at toot)))
          (original-timestamp (cdr (assoc 'created_at original-toot))))
     (with-mock
-      ;; We don't expect to use the toot's timestamp but the timestamp of the
-      ;; reblogged toot:
-      (mock (date-to-time timestamp) => '(1 2))
-      (mock (format-time-string mastodon-toot-timestamp-format '(1 2)) => "reblogging time")
-      (mock (date-to-time original-timestamp) => '(3 4))
-      (mock (format-time-string mastodon-toot-timestamp-format '(3 4)) => "original time")
-
-      (let ((byline (mastodon-tl--byline toot
-					 'mastodon-tl--byline-author
-					 'mastodon-tl--byline-boosted))
-	    (handle1-location 20)
-	    (handle2-location 65))
-	(should (string= (substring-no-properties byline)
-			 "Account 42 (@acct42@example.space)
+     ;; We don't expect to use the toot's timestamp but the timestamp of the
+     ;; reblogged toot:
+     (mock (date-to-time timestamp) => '(1 2))
+     (mock (format-time-string mastodon-toot-timestamp-format '(1 2)) => "reblogging time")
+     (mock (date-to-time original-timestamp) => '(3 4))
+     (mock (format-time-string mastodon-toot-timestamp-format '(3 4)) => "original time")
+
+     (let ((byline (mastodon-tl--byline toot
+					'mastodon-tl--byline-author
+					'mastodon-tl--byline-boosted))
+	   (handle1-location 20)
+	   (handle2-location 65))
+       (should (string= (substring-no-properties byline)
+			"Account 42 (@acct42@example.space)
  Boosted Account 43 (@acct43@example.space) original time
   ------------
 "))
-	(should (eq (get-text-property handle1-location 'mastodon-tab-stop byline)
-                'user-handle))
-	(should (equal (get-text-property handle1-location 'help-echo byline)
-		       "Browse user profile of @acct42@example.space"))
-	(should (eq (get-text-property handle2-location 'mastodon-tab-stop byline)
-                'user-handle))
-	(should (equal (get-text-property handle2-location 'help-echo byline)
-                   "Browse user profile of @acct43@example.space"))))))
+       (should (eq (get-text-property handle1-location 'mastodon-tab-stop byline)
+                   'user-handle))
+       (should (equal (get-text-property handle1-location 'help-echo byline)
+		      "Browse user profile of @acct42@example.space"))
+       (should (eq (get-text-property handle2-location 'mastodon-tab-stop byline)
+                   'user-handle))
+       (should (equal (get-text-property handle2-location 'help-echo byline)
+                      "Browse user profile of @acct43@example.space"))))))
 
 (ert-deftest mastodon-tl--byline-reblogged-with-avatars ()
   "Should format the reblogged toot correctly."
@@ -383,19 +383,19 @@ a string or a numeric."
          (timestamp (cdr (assoc 'created_at toot)))
          (original-timestamp (cdr (assoc 'created_at original-toot))))
     (with-mock
-      ;; We don't expect to use the toot's timestamp but the timestamp of the
-      ;; reblogged toot:
-      (stub create-image => '(image "fake data"))
-      (mock (date-to-time timestamp) => '(1 2))
-      (mock (format-time-string mastodon-toot-timestamp-format '(1 2)) => "reblogging time")
-      (mock (date-to-time original-timestamp) => '(3 4))
-      (mock (format-time-string mastodon-toot-timestamp-format '(3 4)) => "original time")
-
-      (should (string= (substring-no-properties
-                        (mastodon-tl--byline toot
-                                             'mastodon-tl--byline-author
-                                             'mastodon-tl--byline-boosted))
-                       "Account 42 (@acct42@example.space)
+     ;; We don't expect to use the toot's timestamp but the timestamp of the
+     ;; reblogged toot:
+     (stub create-image => '(image "fake data"))
+     (mock (date-to-time timestamp) => '(1 2))
+     (mock (format-time-string mastodon-toot-timestamp-format '(1 2)) => "reblogging time")
+     (mock (date-to-time original-timestamp) => '(3 4))
+     (mock (format-time-string mastodon-toot-timestamp-format '(3 4)) => "original time")
+
+     (should (string= (substring-no-properties
+                       (mastodon-tl--byline toot
+                                            'mastodon-tl--byline-author
+                                            'mastodon-tl--byline-boosted))
+                      "Account 42 (@acct42@example.space)
  Boosted Account 43 (@acct43@example.space) original time
   ------------
 ")))))
@@ -408,17 +408,17 @@ a string or a numeric."
          (timestamp (cdr (assoc 'created_at toot)))
          (original-timestamp (cdr (assoc 'created_at original-toot))))
     (with-mock
-      ;; We don't expect to use the toot's timestamp but the timestamp of the
-      ;; reblogged toot:
-      (mock (date-to-time timestamp) => '(1 2))
-      (mock (format-time-string mastodon-toot-timestamp-format '(1 2)) => "reblogging time")
-      (mock (date-to-time original-timestamp) => '(3 4))
-      (mock (format-time-string mastodon-toot-timestamp-format '(3 4)) => "original time")
-
-      (should (string= (substring-no-properties
-                        (mastodon-tl--byline toot
-                                             'mastodon-tl--byline-author
-                                             'mastodon-tl--byline-boosted))
+     ;; We don't expect to use the toot's timestamp but the timestamp of the
+     ;; reblogged toot:
+     (mock (date-to-time timestamp) => '(1 2))
+     (mock (format-time-string mastodon-toot-timestamp-format '(1 2)) => "reblogging time")
+     (mock (date-to-time original-timestamp) => '(3 4))
+     (mock (format-time-string mastodon-toot-timestamp-format '(3 4)) => "original time")
+
+     (should (string= (substring-no-properties
+                       (mastodon-tl--byline toot
+                                            'mastodon-tl--byline-author
+                                            'mastodon-tl--byline-boosted))
                       "(B) (F) Account 42 (@acct42@example.space)
  Boosted Account 43 (@acct43@example.space) original time
   ------------
@@ -429,17 +429,17 @@ a string or a numeric."
   (let ((mastodon-tl--show-avatars-p nil)
         (timestamp (cdr (assoc 'created_at mastodon-tl-test-base-toot))))
     (with-mock
-      (mock (date-to-time timestamp) => '(22782 21551))
-      (mock (current-time) => '(22782 22000))
-      (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
-
-      (let* ((formatted-string (mastodon-tl--byline mastodon-tl-test-base-toot
-                                                    'mastodon-tl--byline-author
-                                                    'mastodon-tl--byline-boosted))
-             (timestamp-start (string-match "2999-99-99" formatted-string))
-             (properties (text-properties-at timestamp-start formatted-string)))
-        (should (equal '(22782 21551) (plist-get properties 'timestamp)))
-        (should (string-equal "7 minutes ago" (plist-get properties 'display)))))))
+     (mock (date-to-time timestamp) => '(22782 21551))
+     (mock (current-time) => '(22782 22000))
+     (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
+
+     (let* ((formatted-string (mastodon-tl--byline mastodon-tl-test-base-toot
+                                                   'mastodon-tl--byline-author
+                                                   'mastodon-tl--byline-boosted))
+            (timestamp-start (string-match "2999-99-99" formatted-string))
+            (properties (text-properties-at timestamp-start formatted-string)))
+       (should (equal '(22782 21551) (plist-get properties 'timestamp)))
+       (should (string-equal "7 minutes ago" (plist-get properties 'display)))))))
 
 (ert-deftest mastodon-tl--consider-timestamp-for-updates-no-active-callback ()
   "Should update the timestamp update variables as expected."
@@ -454,33 +454,33 @@ a string or a numeric."
 
       ;; something a later update doesn't update:
       (with-mock
-        (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
-              (cons "xxx ago" (time-add long-in-the-future (seconds-to-time 100))))
+       (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
+             (cons "xxx ago" (time-add long-in-the-future (seconds-to-time 100))))
 
-        (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
+       (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
 
-        (should (null mastodon-tl--timestamp-update-timer))
-        (should (eq mastodon-tl--timestamp-next-update long-in-the-future)))
+       (should (null mastodon-tl--timestamp-update-timer))
+       (should (eq mastodon-tl--timestamp-next-update long-in-the-future)))
 
       ;; something only shortly sooner doesn't update:
       (with-mock
-        (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
-              (cons "xxx ago" (time-subtract long-in-the-future (seconds-to-time 9))))
+       (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
+             (cons "xxx ago" (time-subtract long-in-the-future (seconds-to-time 9))))
 
-        (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
+       (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
 
-        (should (null mastodon-tl--timestamp-update-timer))
-        (should (eq mastodon-tl--timestamp-next-update long-in-the-future)))
+       (should (null mastodon-tl--timestamp-update-timer))
+       (should (eq mastodon-tl--timestamp-next-update long-in-the-future)))
 
       ;; something much sooner, does update
       (with-mock
-        (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
-              (cons "xxx ago"  soon-in-the-future))
+       (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
+             (cons "xxx ago"  soon-in-the-future))
 
-        (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
+       (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
 
-        (should (null mastodon-tl--timestamp-update-timer))
-        (should (eq mastodon-tl--timestamp-next-update soon-in-the-future)))
+       (should (null mastodon-tl--timestamp-update-timer))
+       (should (eq mastodon-tl--timestamp-next-update soon-in-the-future)))
       )))
 
 (ert-deftest mastodon-tl--consider-timestamp-for-updates-with-active-callback ()
@@ -496,27 +496,27 @@ a string or a numeric."
 
       ;; something a later update doesn't update:
       (with-mock
-        (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
-              (cons "xxx ago" (time-add long-in-the-future (seconds-to-time 100))))
+       (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
+             (cons "xxx ago" (time-add long-in-the-future (seconds-to-time 100))))
 
-        (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
+       (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
 
-        (should (eq 'initial-timer mastodon-tl--timestamp-update-timer))
-        (should (eq mastodon-tl--timestamp-next-update long-in-the-future)))
+       (should (eq 'initial-timer mastodon-tl--timestamp-update-timer))
+       (should (eq mastodon-tl--timestamp-next-update long-in-the-future)))
 
       ;; something much sooner, does update
       (with-mock
-        (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
-              (cons "xxx ago"  soon-in-the-future))
-        (mock (cancel-timer 'initial-timer))
-        (mock (run-at-time soon-in-the-future nil
-                           #'mastodon-tl--update-timestamps-callback
-                           (current-buffer) nil) => 'new-timer)
+       (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
+             (cons "xxx ago"  soon-in-the-future))
+       (mock (cancel-timer 'initial-timer))
+       (mock (run-at-time soon-in-the-future nil
+                          #'mastodon-tl--update-timestamps-callback
+                          (current-buffer) nil) => 'new-timer)
 
-        (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
+       (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
 
-        (should (eq 'new-timer mastodon-tl--timestamp-update-timer))
-        (should (eq mastodon-tl--timestamp-next-update soon-in-the-future)))
+       (should (eq 'new-timer mastodon-tl--timestamp-update-timer))
+       (should (eq mastodon-tl--timestamp-next-update soon-in-the-future)))
       )))
 
 (ert-deftest mastodon-tl--find-property-range--no-tag ()
@@ -769,45 +769,45 @@ constant."
   (let ((now (current-time))
         markers)
     (cl-labels ((insert-timestamp (n)
-                                  (insert (format "\nSome text before timestamp %s:" n))
-                                  (insert (propertize
-                                           (format "timestamp #%s" n)
-                                           'timestamp (time-subtract now (seconds-to-time (* 60 n)))
-                                           'display (format "unset %s" n)))
-                                  (push (copy-marker (point)) markers)
-                                  (insert " some more text.")))
+                  (insert (format "\nSome text before timestamp %s:" n))
+                  (insert (propertize
+                           (format "timestamp #%s" n)
+                           'timestamp (time-subtract now (seconds-to-time (* 60 n)))
+                           'display (format "unset %s" n)))
+                  (push (copy-marker (point)) markers)
+                  (insert " some more text.")))
       (with-temp-buffer
         (cl-dotimes (n 12) (insert-timestamp (+ n 2)))
         (setq markers (nreverse markers))
 
         (with-mock
-          (mock (current-time) => now)
-          (stub run-at-time => 'fake-timer)
-
-          ;; make the initial call
-          (mastodon-tl--update-timestamps-callback (current-buffer) nil)
-          (should (equal '("2 minutes ago" "3 minutes ago" "4 minutes ago" "5 minutes ago" "6 minutes ago"
-                           "unset 7" "unset 8" "unset 9" "unset 10" "unset 11" "unset 12" "unset 13")
-                         (tl-tests--property-values-at 'display
-                                                       (tl-tests--all-regions-with-property 'timestamp))))
-
-          ;; fake the follow-up call
-          (mastodon-tl--update-timestamps-callback (current-buffer) (nth 4 markers))
-          (should (equal '("2 minutes ago" "3 minutes ago" "4 minutes ago" "5 minutes ago" "6 minutes ago"
-                           "7 minutes ago" "8 minutes ago" "9 minutes ago" "10 minutes ago" "11 minutes ago"
-                           "unset 12" "unset 13")
-                         (tl-tests--property-values-at 'display
-                                                       (tl-tests--all-regions-with-property 'timestamp))))
-          (should (null (marker-position (nth 4 markers))))
-
-          ;; fake the follow-up call
-          (mastodon-tl--update-timestamps-callback (current-buffer) (nth 9 markers))
-          (should (equal '("2 minutes ago" "3 minutes ago" "4 minutes ago" "5 minutes ago" "6 minutes ago"
-                           "7 minutes ago" "8 minutes ago" "9 minutes ago" "10 minutes ago" "11 minutes ago"
-                           "12 minutes ago" "13 minutes ago")
-                         (tl-tests--property-values-at 'display
-                                                       (tl-tests--all-regions-with-property 'timestamp))))
-          (should (null (marker-position (nth 9 markers)))))))))
+         (mock (current-time) => now)
+         (stub run-at-time => 'fake-timer)
+
+         ;; make the initial call
+         (mastodon-tl--update-timestamps-callback (current-buffer) nil)
+         (should (equal '("2 minutes ago" "3 minutes ago" "4 minutes ago" "5 minutes ago" "6 minutes ago"
+                          "unset 7" "unset 8" "unset 9" "unset 10" "unset 11" "unset 12" "unset 13")
+                        (tl-tests--property-values-at 'display
+                                                      (tl-tests--all-regions-with-property 'timestamp))))
+
+         ;; fake the follow-up call
+         (mastodon-tl--update-timestamps-callback (current-buffer) (nth 4 markers))
+         (should (equal '("2 minutes ago" "3 minutes ago" "4 minutes ago" "5 minutes ago" "6 minutes ago"
+                          "7 minutes ago" "8 minutes ago" "9 minutes ago" "10 minutes ago" "11 minutes ago"
+                          "unset 12" "unset 13")
+                        (tl-tests--property-values-at 'display
+                                                      (tl-tests--all-regions-with-property 'timestamp))))
+         (should (null (marker-position (nth 4 markers))))
+
+         ;; fake the follow-up call
+         (mastodon-tl--update-timestamps-callback (current-buffer) (nth 9 markers))
+         (should (equal '("2 minutes ago" "3 minutes ago" "4 minutes ago" "5 minutes ago" "6 minutes ago"
+                          "7 minutes ago" "8 minutes ago" "9 minutes ago" "10 minutes ago" "11 minutes ago"
+                          "12 minutes ago" "13 minutes ago")
+                        (tl-tests--property-values-at 'display
+                                                      (tl-tests--all-regions-with-property 'timestamp))))
+         (should (null (marker-position (nth 9 markers)))))))))
 
 (ert-deftest mastodon-tl--has-spoiler ()
   "Should be able to detect toots with spoiler text as expected"
@@ -925,13 +925,13 @@ constant."
 
 (ert-deftest mastodon-tl--extract-hashtag-from-url-wrong-instance ()
   (should (null (mastodon-tl--extract-hashtag-from-url
-		  "https://example.org/tags/foo"
-		  "https://other.example.org"))))
+		 "https://example.org/tags/foo"
+		 "https://other.example.org"))))
 
 (ert-deftest mastodon-tl--extract-hashtag-from-url-not-tag ()
   (should (null (mastodon-tl--extract-hashtag-from-url
-		  "https://example.org/@userid"
-		  "https://example.org"))))
+		 "https://example.org/@userid"
+		 "https://example.org"))))
 
 (ert-deftest mastodon-tl--userhandles ()
   "Should recognise iserhandles in a toot and add the required properties to it."
diff --git a/test/mastodon-toot-tests.el b/test/mastodon-toot-tests.el
index 06da870..abc66d0 100644
--- a/test/mastodon-toot-tests.el
+++ b/test/mastodon-toot-tests.el
@@ -41,6 +41,6 @@
 
 (ert-deftest cancel ()
   (with-mock
-    (mock (kill-buffer-and-window))
-    (mastodon-toot--cancel)
-    (mock-verify)))
+   (mock (kill-buffer-and-window))
+   (mastodon-toot--cancel)
+   (mock-verify)))
-- 
cgit v1.2.3


From b02782226b34507508020179e3100c307738eeee Mon Sep 17 00:00:00 2001
From: mousebot <mousebot@riseup.net>
Date: Tue, 9 Nov 2021 10:37:57 +0100
Subject: update test mastodon-media:get-media-link-rendering with extra props

---
 test/mastodon-media-tests.el | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/mastodon-media-tests.el b/test/mastodon-media-tests.el
index b537dfe..7124672 100644
--- a/test/mastodon-media-tests.el
+++ b/test/mastodon-media-tests.el
@@ -22,14 +22,22 @@
    (mock (create-image * nil t) => :mock-image)
 
    (let* ((mastodon-media--preview-max-height 123)
-          (result (mastodon-media--get-media-link-rendering "http://example.org/img.png"))
+          (result
+           (mastodon-media--get-media-link-rendering "http://example.org/img.png"
+                                                     "http://example.org/remote/img.png"))
           (result-no-properties (substring-no-properties result))
           (properties (text-properties-at 0 result)))
      (should (string= "[img] " result-no-properties))
      (should (string= "http://example.org/img.png" (plist-get properties 'media-url)))
      (should (eq 'needs-loading (plist-get properties 'media-state)))
      (should (eq 'media-link (plist-get properties 'media-type)))
-     (should (eq :mock-image (plist-get properties 'display))))))
+     (should (eq :mock-image (plist-get properties 'display)))
+     (should (eq 'highlight (plist-get properties 'mouse-face)))
+     (should (eq 'image (plist-get properties 'mastodon-tab-stop)))
+     (should (string= "http://example.org/remote/img.png" (plist-get properties 'image-url)))
+     (should (eq mastodon-tl--shr-image-map-replacement (plist-get properties 'keymap)))
+     (should (string= "RET/i: load full image (prefix: copy URL), +/-: zoom, r: rotate, o: save preview"
+                 (plist-get properties 'help-echo))))))
 
 (ert-deftest mastodon-media:load-image-from-url:avatar-with-imagemagic ()
   "Should make the right call to url-retrieve."
-- 
cgit v1.2.3


From 3014e10ec268250a130ac490b5f32b3d263ad21b Mon Sep 17 00:00:00 2001
From: mousebot <mousebot@riseup.net>
Date: Tue, 9 Nov 2021 11:35:57 +0100
Subject: update mastodon-media:get-media-link-rendering{-gif}

to handle adding property "type" to media, and to display in help-echo if not
an image.
---
 test/mastodon-media-tests.el | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/mastodon-media-tests.el b/test/mastodon-media-tests.el
index 7124672..252c819 100644
--- a/test/mastodon-media-tests.el
+++ b/test/mastodon-media-tests.el
@@ -24,7 +24,8 @@
    (let* ((mastodon-media--preview-max-height 123)
           (result
            (mastodon-media--get-media-link-rendering "http://example.org/img.png"
-                                                     "http://example.org/remote/img.png"))
+                                                     "http://example.org/remote/img.png"
+                                                     "image"))
           (result-no-properties (substring-no-properties result))
           (properties (text-properties-at 0 result)))
      (should (string= "[img] " result-no-properties))
@@ -36,7 +37,33 @@
      (should (eq 'image (plist-get properties 'mastodon-tab-stop)))
      (should (string= "http://example.org/remote/img.png" (plist-get properties 'image-url)))
      (should (eq mastodon-tl--shr-image-map-replacement (plist-get properties 'keymap)))
+     (should (string= "image" (plist-get properties 'mastodon-media-type)))
      (should (string= "RET/i: load full image (prefix: copy URL), +/-: zoom, r: rotate, o: save preview"
+                      (plist-get properties 'help-echo))))))
+
+(ert-deftest mastodon-media:get-media-link-rendering-gif ()
+  "Should return text with all expected properties."
+  (with-mock
+   (mock (create-image * nil t) => :mock-image)
+
+   (let* ((mastodon-media--preview-max-height 123)
+          (result
+           (mastodon-media--get-media-link-rendering "http://example.org/img.png"
+                                                     "http://example.org/remote/img.png"
+                                                     "gifv"))
+          (result-no-properties (substring-no-properties result))
+          (properties (text-properties-at 0 result)))
+     (should (string= "[img] " result-no-properties))
+     (should (string= "http://example.org/img.png" (plist-get properties 'media-url)))
+     (should (eq 'needs-loading (plist-get properties 'media-state)))
+     (should (eq 'media-link (plist-get properties 'media-type)))
+     (should (eq :mock-image (plist-get properties 'display)))
+     (should (eq 'highlight (plist-get properties 'mouse-face)))
+     (should (eq 'image (plist-get properties 'mastodon-tab-stop)))
+     (should (string= "http://example.org/remote/img.png" (plist-get properties 'image-url)))
+     (should (eq mastodon-tl--shr-image-map-replacement (plist-get properties 'keymap)))
+     (should (string= "gifv" (plist-get properties 'mastodon-media-type)))
+     (should (string= "RET/i: load full image (prefix: copy URL), +/-: zoom, r: rotate, o: save preview\ntype: gifv"
                  (plist-get properties 'help-echo))))))
 
 (ert-deftest mastodon-media:load-image-from-url:avatar-with-imagemagic ()
-- 
cgit v1.2.3


From 6b4a47290bf32f5be670d6aa92c3e7780e667ff3 Mon Sep 17 00:00:00 2001
From: Holger Dürer <me@hdurer.net>
Date: Mon, 8 Nov 2021 20:17:23 +0100
Subject: Change `mastodon-auth-test.el` to not expect errors.

Instead let's catch the error and then assert the correct error text.

This is more specific and also looks nicer on a test run as there are
no `F` symbols for the (expected) failures.
---
 test/mastodon-auth-test.el | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/test/mastodon-auth-test.el b/test/mastodon-auth-test.el
index 9a765b9..4372047 100644
--- a/test/mastodon-auth-test.el
+++ b/test/mastodon-auth-test.el
@@ -36,12 +36,24 @@
   (should (string= "foo" (mastodon-auth--handle-token-response '(:access_token "foo" :token_type "Bearer" :scope "read write follow" :created_at 0)))))
 
 (ert-deftest mastodon-auth--handle-token-response--unknown ()
-  :expected-result :failed
-  (mastodon-auth--handle-token-response '(:herp "derp")))
+  (should
+   (equal
+    '(error "Unknown response from mastodon-auth--get-token!")
+    (condition-case error
+        (progn
+          (mastodon-auth--handle-token-response '(:herp "derp"))
+          nil)
+      (t error)))))
 
 (ert-deftest mastodon-auth--handle-token-response--failure ()
-  :expected-result :failed
-  (mastodon-auth--handle-token-response '(:error "invalid_grant" :error_description "The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client.")))
+  (let ((error-message "The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client."))
+    (should
+     (equal
+      `(error ,(format "Mastodon-auth--access-token: invalid_grant: %s" error-message))
+      (condition-case error
+          (mastodon-auth--handle-token-response
+           `(:error "invalid_grant" :error_description ,error-message))
+        (t error))))))
 
 (provide 'mastodon-auth--test)
 ;;; mastodon-auth--test.el ends here
-- 
cgit v1.2.3


From 5df05d94926ada6843cbc65aea4b64c18429fdf1 Mon Sep 17 00:00:00 2001
From: Holger Dürer <me@hdurer.net>
Date: Mon, 8 Nov 2021 20:28:25 +0100
Subject: Reformatting `mastodon-search-tests.el`.

- Remove redundant let binding of vars
- Re-indent various things to better fit reasonably on a screen.
---
 test/mastodon-auth-tests.el         |  80 +++----
 test/mastodon-client-tests.el       |  78 +++----
 test/mastodon-http-tests.el         |   6 +-
 test/mastodon-media-tests.el        | 344 ++++++++++++++---------------
 test/mastodon-notifications-test.el |   4 +-
 test/mastodon-search-tests.el       |  92 ++++----
 test/mastodon-tl-tests.el           | 418 ++++++++++++++++++------------------
 test/mastodon-toot-tests.el         |   6 +-
 8 files changed, 517 insertions(+), 511 deletions(-)

(limited to 'test')

diff --git a/test/mastodon-auth-tests.el b/test/mastodon-auth-tests.el
index 69c34a4..fda04eb 100644
--- a/test/mastodon-auth-tests.el
+++ b/test/mastodon-auth-tests.el
@@ -3,52 +3,52 @@
 (ert-deftest generate-token--no-storing-credentials ()
   "Should make `mastdon-http--post' request to generate auth token."
   (with-mock
-   (let ((mastodon-auth-source-file "")
-	 (mastodon-instance-url "https://instance.url"))
-     (mock (mastodon-client) => '(:client_id "id" :client_secret "secret"))
-     (mock (read-string "Email: " user-mail-address) => "foo@bar.com")
-     (mock (read-passwd "Password: ") => "password")
-     (mock (mastodon-http--post "https://instance.url/oauth/token"
-                                '(("client_id" . "id")
-                                  ("client_secret" . "secret")
-                                  ("grant_type" . "password")
-                                  ("username" . "foo@bar.com")
-                                  ("password" . "password")
-                                  ("scope" . "read write follow"))
-                                nil
-                                :unauthenticated))
-     (mastodon-auth--generate-token))))
+    (let ((mastodon-auth-source-file "")
+	  (mastodon-instance-url "https://instance.url"))
+      (mock (mastodon-client) => '(:client_id "id" :client_secret "secret"))
+      (mock (read-string "Email: " user-mail-address) => "foo@bar.com")
+      (mock (read-passwd "Password: ") => "password")
+      (mock (mastodon-http--post "https://instance.url/oauth/token"
+                                 '(("client_id" . "id")
+                                   ("client_secret" . "secret")
+                                   ("grant_type" . "password")
+                                   ("username" . "foo@bar.com")
+                                   ("password" . "password")
+                                   ("scope" . "read write follow"))
+                                 nil
+                                 :unauthenticated))
+      (mastodon-auth--generate-token))))
 
 (ert-deftest generate-token--storing-credentials ()
   "Should make `mastdon-http--post' request to generate auth token."
   (with-mock
-   (let ((mastodon-auth-source-file "~/.authinfo")
-	 (mastodon-instance-url "https://instance.url"))
-     (mock (mastodon-client) => '(:client_id "id" :client_secret "secret"))
-     (mock (auth-source-search :create t
-                               :host "https://instance.url"
-                               :port 443
-                               :require '(:user :secret))
-           => '((:user "foo@bar.com" :secret (lambda () "password"))))
-     (mock (mastodon-http--post "https://instance.url/oauth/token"
-                                '(("client_id" . "id")
-                                  ("client_secret" . "secret")
-                                  ("grant_type" . "password")
-                                  ("username" . "foo@bar.com")
-                                  ("password" . "password")
-                                  ("scope" . "read write follow"))
-                                nil
-				:unauthenticated))
-     (mastodon-auth--generate-token))))
+    (let ((mastodon-auth-source-file "~/.authinfo")
+	  (mastodon-instance-url "https://instance.url"))
+      (mock (mastodon-client) => '(:client_id "id" :client_secret "secret"))
+      (mock (auth-source-search :create t
+                                :host "https://instance.url"
+                                :port 443
+                                :require '(:user :secret))
+            => '((:user "foo@bar.com" :secret (lambda () "password"))))
+      (mock (mastodon-http--post "https://instance.url/oauth/token"
+                                 '(("client_id" . "id")
+                                   ("client_secret" . "secret")
+                                   ("grant_type" . "password")
+                                   ("username" . "foo@bar.com")
+                                   ("password" . "password")
+                                   ("scope" . "read write follow"))
+                                 nil
+				 :unauthenticated))
+      (mastodon-auth--generate-token))))
 
 (ert-deftest get-token ()
   "Should generate token and return JSON response."
   (with-temp-buffer
     (with-mock
-     (mock (mastodon-auth--generate-token) => (progn
-                                                (insert "\n\n{\"access_token\":\"abcdefg\"}")
-                                                (current-buffer)))
-     (should (equal (mastodon-auth--get-token) '(:access_token "abcdefg"))))))
+      (mock (mastodon-auth--generate-token) => (progn
+                                                 (insert "\n\n{\"access_token\":\"abcdefg\"}")
+                                                 (current-buffer)))
+      (should (equal (mastodon-auth--get-token) '(:access_token "abcdefg"))))))
 
 (ert-deftest access-token-found ()
   "Should return value in `mastodon-auth--token-alist' if found."
@@ -61,6 +61,6 @@
   (let ((mastodon-instance-url "https://instance.url")
         (mastodon-auth--token nil))
     (with-mock
-     (mock (mastodon-auth--get-token) => '(:access_token "foobaz"))
-     (should (string= (mastodon-auth--access-token) "foobaz"))
-     (should (equal mastodon-auth--token-alist '(("https://instance.url" . "foobaz")))))))
+      (mock (mastodon-auth--get-token) => '(:access_token "foobaz"))
+      (should (string= (mastodon-auth--access-token) "foobaz"))
+      (should (equal mastodon-auth--token-alist '(("https://instance.url" . "foobaz")))))))
diff --git a/test/mastodon-client-tests.el b/test/mastodon-client-tests.el
index d7f750d..12d2350 100644
--- a/test/mastodon-client-tests.el
+++ b/test/mastodon-client-tests.el
@@ -3,35 +3,35 @@
 (ert-deftest register ()
   "Should POST to /apps."
   (with-mock
-   (mock (mastodon-http--api "apps") => "https://instance.url/api/v1/apps")
-   (mock (mastodon-http--post "https://instance.url/api/v1/apps"
-                              '(("client_name" . "mastodon.el")
-                                ("redirect_uris" . "urn:ietf:wg:oauth:2.0:oob")
-                                ("scopes" . "read write follow")
-                                ("website" . "https://github.com/jdenen/mastodon.el"))
-                              nil
-                              :unauthenticated))
-   (mastodon-client--register)))
+    (mock (mastodon-http--api "apps") => "https://instance.url/api/v1/apps")
+    (mock (mastodon-http--post "https://instance.url/api/v1/apps"
+                               '(("client_name" . "mastodon.el")
+                                 ("redirect_uris" . "urn:ietf:wg:oauth:2.0:oob")
+                                 ("scopes" . "read write follow")
+                                 ("website" . "https://github.com/jdenen/mastodon.el"))
+                               nil
+                               :unauthenticated))
+    (mastodon-client--register)))
 
 (ert-deftest fetch ()
   "Should return client registration JSON."
   (with-temp-buffer
     (with-mock
-     (mock (mastodon-client--register) => (progn
-                                            (insert "\n\n{\"foo\":\"bar\"}")
-                                            (current-buffer)))
-     (should (equal (mastodon-client--fetch) '(:foo "bar"))))))
+      (mock (mastodon-client--register) => (progn
+                                             (insert "\n\n{\"foo\":\"bar\"}")
+                                             (current-buffer)))
+      (should (equal (mastodon-client--fetch) '(:foo "bar"))))))
 
 (ert-deftest store-1 ()
   "Should return the client plist."
   (let ((mastodon-instance-url "http://mastodon.example")
         (plist '(:client_id "id" :client_secret "secret")))
     (with-mock
-     (mock (mastodon-client--token-file) => "stubfile.plstore")
-     (mock (mastodon-client--fetch) => '(:client_id "id" :client_secret "secret"))
-     (let* ((plstore (plstore-open "stubfile.plstore"))
-            (client (cdr (plstore-get plstore "mastodon-http://mastodon.example"))))
-       (should (equal (mastodon-client--store) plist))))))
+      (mock (mastodon-client--token-file) => "stubfile.plstore")
+      (mock (mastodon-client--fetch) => '(:client_id "id" :client_secret "secret"))
+      (let* ((plstore (plstore-open "stubfile.plstore"))
+             (client (cdr (plstore-get plstore "mastodon-http://mastodon.example"))))
+        (should (equal (mastodon-client--store) plist))))))
 
 (ert-deftest store-2 ()
   "Should store client in `mastodon-client--token-file'."
@@ -46,22 +46,22 @@
   "Should return mastodon client from `mastodon-token-file' if it exists."
   (let ((mastodon-instance-url "http://mastodon.example"))
     (with-mock
-     (mock (mastodon-client--token-file) => "fixture/client.plstore")
-     (should (equal (mastodon-client--read)
-                    '(:client_id "id2" :client_secret "secret2"))))))
+      (mock (mastodon-client--token-file) => "fixture/client.plstore")
+      (should (equal (mastodon-client--read)
+                     '(:client_id "id2" :client_secret "secret2"))))))
 
 (ert-deftest read-finds-no-match ()
   "Should return mastodon client from `mastodon-token-file' if it exists."
   (let ((mastodon-instance-url "http://mastodon.social"))
     (with-mock
-     (mock (mastodon-client--token-file) => "fixture/client.plstore")
-     (should (equal (mastodon-client--read) nil)))))
+      (mock (mastodon-client--token-file) => "fixture/client.plstore")
+      (should (equal (mastodon-client--read) nil)))))
 
 (ert-deftest read-empty-store ()
   "Should return nil if mastodon client is not present in the plstore."
   (with-mock
-   (mock (mastodon-client--token-file) => "fixture/empty.plstore")
-   (should (equal (mastodon-client--read) nil))))
+    (mock (mastodon-client--token-file) => "fixture/empty.plstore")
+    (should (equal (mastodon-client--read) nil))))
 
 (ert-deftest client-set-and-matching ()
   "Should return `mastondon-client' if `mastodon-client--client-details-alist' is non-nil and instance url is included."
@@ -75,29 +75,29 @@
   (let ((mastodon-instance-url "http://mastodon.example")
         (mastodon-client--client-details-alist '(("http://other.example" :wrong))))
     (with-mock
-     (mock (mastodon-client--read) => '(:client_id "foo" :client_secret "bar"))
-     (should (equal (mastodon-client) '(:client_id "foo" :client_secret "bar")))
-     (should (equal mastodon-client--client-details-alist
-                    '(("http://mastodon.example" :client_id "foo" :client_secret "bar")
-                      ("http://other.example" :wrong)))))))
+      (mock (mastodon-client--read) => '(:client_id "foo" :client_secret "bar"))
+      (should (equal (mastodon-client) '(:client_id "foo" :client_secret "bar")))
+      (should (equal mastodon-client--client-details-alist
+                     '(("http://mastodon.example" :client_id "foo" :client_secret "bar")
+                       ("http://other.example" :wrong)))))))
 
 (ert-deftest client-unset ()
   "Should read from `mastodon-token-file' if available."
   (let ((mastodon-instance-url "http://mastodon.example")
         (mastodon-client--client-details-alist nil))
     (with-mock
-     (mock (mastodon-client--read) => '(:client_id "foo" :client_secret "bar"))
-     (should (equal (mastodon-client) '(:client_id "foo" :client_secret "bar")))
-     (should (equal mastodon-client--client-details-alist
-                    '(("http://mastodon.example" :client_id "foo" :client_secret "bar")))))))
+      (mock (mastodon-client--read) => '(:client_id "foo" :client_secret "bar"))
+      (should (equal (mastodon-client) '(:client_id "foo" :client_secret "bar")))
+      (should (equal mastodon-client--client-details-alist
+                     '(("http://mastodon.example" :client_id "foo" :client_secret "bar")))))))
 
 (ert-deftest client-unset-and-not-in-storage ()
   "Should store client data in plstore if it can't be read."
   (let ((mastodon-instance-url "http://mastodon.example")
         (mastodon-client--client-details-alist nil))
     (with-mock
-     (mock (mastodon-client--read))
-     (mock (mastodon-client--store) => '(:client_id "foo" :client_secret "baz"))
-     (should (equal (mastodon-client) '(:client_id "foo" :client_secret "baz")))
-     (should (equal mastodon-client--client-details-alist
-                    '(("http://mastodon.example" :client_id "foo" :client_secret "baz")))))))
+      (mock (mastodon-client--read))
+      (mock (mastodon-client--store) => '(:client_id "foo" :client_secret "baz"))
+      (should (equal (mastodon-client) '(:client_id "foo" :client_secret "baz")))
+      (should (equal mastodon-client--client-details-alist
+                     '(("http://mastodon.example" :client_id "foo" :client_secret "baz")))))))
diff --git a/test/mastodon-http-tests.el b/test/mastodon-http-tests.el
index 03d4f94..d0f715e 100644
--- a/test/mastodon-http-tests.el
+++ b/test/mastodon-http-tests.el
@@ -4,6 +4,6 @@
   "Should make a `url-retrieve' of the given URL."
   (let ((callback-double (lambda () "double")))
     (with-mock
-     (mock (mastodon-http--url-retrieve-synchronously "https://foo.bar/baz"))
-     (mock (mastodon-auth--access-token) => "test-token")
-     (mastodon-http--get "https://foo.bar/baz"))))
+      (mock (mastodon-http--url-retrieve-synchronously "https://foo.bar/baz"))
+      (mock (mastodon-auth--access-token) => "test-token")
+      (mastodon-http--get "https://foo.bar/baz"))))
diff --git a/test/mastodon-media-tests.el b/test/mastodon-media-tests.el
index 7124672..3345e74 100644
--- a/test/mastodon-media-tests.el
+++ b/test/mastodon-media-tests.el
@@ -3,215 +3,215 @@
 (ert-deftest mastodon-media:get-avatar-rendering ()
   "Should return text with all expected properties."
   (with-mock
-   (mock (image-type-available-p 'imagemagick) => t)
-   (mock (create-image * (when (version< emacs-version "27.1") 'imagemagick) t :height 123) => :mock-image)
-
-   (let* ((mastodon-media--avatar-height 123)
-          (result (mastodon-media--get-avatar-rendering "http://example.org/img.png"))
-          (result-no-properties (substring-no-properties result))
-          (properties (text-properties-at 0 result)))
-     (should (string= "  " result-no-properties))
-     (should (string= "http://example.org/img.png" (plist-get properties 'media-url)))
-     (should (eq 'needs-loading (plist-get properties 'media-state)))
-     (should (eq 'avatar (plist-get properties 'media-type)))
-     (should (eq :mock-image (plist-get properties 'display))))))
+    (mock (image-type-available-p 'imagemagick) => t)
+    (mock (create-image * (when (version< emacs-version "27.1") 'imagemagick) t :height 123) => :mock-image)
+
+    (let* ((mastodon-media--avatar-height 123)
+           (result (mastodon-media--get-avatar-rendering "http://example.org/img.png"))
+           (result-no-properties (substring-no-properties result))
+           (properties (text-properties-at 0 result)))
+      (should (string= "  " result-no-properties))
+      (should (string= "http://example.org/img.png" (plist-get properties 'media-url)))
+      (should (eq 'needs-loading (plist-get properties 'media-state)))
+      (should (eq 'avatar (plist-get properties 'media-type)))
+      (should (eq :mock-image (plist-get properties 'display))))))
 
 (ert-deftest mastodon-media:get-media-link-rendering ()
   "Should return text with all expected properties."
   (with-mock
-   (mock (create-image * nil t) => :mock-image)
-
-   (let* ((mastodon-media--preview-max-height 123)
-          (result
-           (mastodon-media--get-media-link-rendering "http://example.org/img.png"
-                                                     "http://example.org/remote/img.png"))
-          (result-no-properties (substring-no-properties result))
-          (properties (text-properties-at 0 result)))
-     (should (string= "[img] " result-no-properties))
-     (should (string= "http://example.org/img.png" (plist-get properties 'media-url)))
-     (should (eq 'needs-loading (plist-get properties 'media-state)))
-     (should (eq 'media-link (plist-get properties 'media-type)))
-     (should (eq :mock-image (plist-get properties 'display)))
-     (should (eq 'highlight (plist-get properties 'mouse-face)))
-     (should (eq 'image (plist-get properties 'mastodon-tab-stop)))
-     (should (string= "http://example.org/remote/img.png" (plist-get properties 'image-url)))
-     (should (eq mastodon-tl--shr-image-map-replacement (plist-get properties 'keymap)))
-     (should (string= "RET/i: load full image (prefix: copy URL), +/-: zoom, r: rotate, o: save preview"
-                 (plist-get properties 'help-echo))))))
+    (mock (create-image * nil t) => :mock-image)
+
+    (let* ((mastodon-media--preview-max-height 123)
+           (result
+            (mastodon-media--get-media-link-rendering "http://example.org/img.png"
+                                                      "http://example.org/remote/img.png"))
+           (result-no-properties (substring-no-properties result))
+           (properties (text-properties-at 0 result)))
+      (should (string= "[img] " result-no-properties))
+      (should (string= "http://example.org/img.png" (plist-get properties 'media-url)))
+      (should (eq 'needs-loading (plist-get properties 'media-state)))
+      (should (eq 'media-link (plist-get properties 'media-type)))
+      (should (eq :mock-image (plist-get properties 'display)))
+      (should (eq 'highlight (plist-get properties 'mouse-face)))
+      (should (eq 'image (plist-get properties 'mastodon-tab-stop)))
+      (should (string= "http://example.org/remote/img.png" (plist-get properties 'image-url)))
+      (should (eq mastodon-tl--shr-image-map-replacement (plist-get properties 'keymap)))
+      (should (string= "RET/i: load full image (prefix: copy URL), +/-: zoom, r: rotate, o: save preview"
+                       (plist-get properties 'help-echo))))))
 
 (ert-deftest mastodon-media:load-image-from-url:avatar-with-imagemagic ()
   "Should make the right call to url-retrieve."
   (let ((url "http://example.org/image.png")
         (mastodon-media--avatar-height 123))
     (with-mock
-     (mock (image-type-available-p 'imagemagick) => t)
-     (mock (create-image
-            *
-            (when (version< emacs-version "27.1") 'imagemagick)
-            t :height 123) => '(image foo))
-     (mock (copy-marker 7) => :my-marker )
-     (mock (url-retrieve
-            url
-            #'mastodon-media--process-image-response
-            `(:my-marker (:height 123) 1 ,url))
-           => :called-as-expected)
-
-     (with-temp-buffer
-       (insert (concat "Start:"
-                       (mastodon-media--get-avatar-rendering "http://example.org/img.png")
-                       ":rest"))
-
-       (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'avatar 7 1)))))))
+      (mock (image-type-available-p 'imagemagick) => t)
+      (mock (create-image
+             *
+             (when (version< emacs-version "27.1") 'imagemagick)
+             t :height 123) => '(image foo))
+      (mock (copy-marker 7) => :my-marker )
+      (mock (url-retrieve
+             url
+             #'mastodon-media--process-image-response
+             `(:my-marker (:height 123) 1 ,url))
+            => :called-as-expected)
+
+      (with-temp-buffer
+        (insert (concat "Start:"
+                        (mastodon-media--get-avatar-rendering "http://example.org/img.png")
+                        ":rest"))
+
+        (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'avatar 7 1)))))))
 
 (ert-deftest mastodon-media:load-image-from-url:avatar-without-imagemagic ()
   "Should make the right call to url-retrieve."
   (let ((url "http://example.org/image.png"))
     (with-mock
-     (mock (image-type-available-p 'imagemagick) => nil)
-     (mock (create-image * nil t) => '(image foo))
-     (mock (copy-marker 7) => :my-marker )
-     (mock (url-retrieve
-            url
-            #'mastodon-media--process-image-response
-            `(:my-marker () 1 ,url))
-           => :called-as-expected)
-
-     (with-temp-buffer
-       (insert (concat "Start:"
-                       (mastodon-media--get-avatar-rendering "http://example.org/img.png")
-                       ":rest"))
-
-       (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'avatar 7 1)))))))
+      (mock (image-type-available-p 'imagemagick) => nil)
+      (mock (create-image * nil t) => '(image foo))
+      (mock (copy-marker 7) => :my-marker )
+      (mock (url-retrieve
+             url
+             #'mastodon-media--process-image-response
+             `(:my-marker () 1 ,url))
+            => :called-as-expected)
+
+      (with-temp-buffer
+        (insert (concat "Start:"
+                        (mastodon-media--get-avatar-rendering "http://example.org/img.png")
+                        ":rest"))
+
+        (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'avatar 7 1)))))))
 
 (ert-deftest mastodon-media:load-image-from-url:media-link-with-imagemagic ()
   "Should make the right call to url-retrieve."
   (let ((url "http://example.org/image.png"))
     (with-mock
-     (mock (image-type-available-p 'imagemagick) => t)
-     (mock (create-image * nil t) => '(image foo))
-     (mock (copy-marker 7) => :my-marker )
-     (mock (url-retrieve
-            "http://example.org/image.png"
-            #'mastodon-media--process-image-response
-            '(:my-marker (:max-height 321) 5 "http://example.org/image.png"))
-           => :called-as-expected)
-     (with-temp-buffer
-       (insert (concat "Start:"
-                       (mastodon-media--get-media-link-rendering url)
-                       ":rest"))
-       (let ((mastodon-media--preview-max-height 321))
-         (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'media-link 7 5))))))))
+      (mock (image-type-available-p 'imagemagick) => t)
+      (mock (create-image * nil t) => '(image foo))
+      (mock (copy-marker 7) => :my-marker )
+      (mock (url-retrieve
+             "http://example.org/image.png"
+             #'mastodon-media--process-image-response
+             '(:my-marker (:max-height 321) 5 "http://example.org/image.png"))
+            => :called-as-expected)
+      (with-temp-buffer
+        (insert (concat "Start:"
+                        (mastodon-media--get-media-link-rendering url)
+                        ":rest"))
+        (let ((mastodon-media--preview-max-height 321))
+          (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'media-link 7 5))))))))
 
 (ert-deftest mastodon-media:load-image-from-url:media-link-without-imagemagic ()
   "Should make the right call to url-retrieve."
   (let ((url "http://example.org/image.png"))
     (with-mock
-     (mock (image-type-available-p 'imagemagick) => nil)
-     (mock (create-image * nil t) => '(image foo))
-     (mock (copy-marker 7) => :my-marker )
-     (mock (url-retrieve
-            "http://example.org/image.png"
-            #'mastodon-media--process-image-response
-            '(:my-marker () 5 "http://example.org/image.png"))
-           => :called-as-expected)
-
-     (with-temp-buffer
-       (insert (concat "Start:"
-                       (mastodon-media--get-avatar-rendering url)
-                       ":rest"))
-       (let ((mastodon-media--preview-max-height 321))
-         (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'media-link 7 5))))))))
+      (mock (image-type-available-p 'imagemagick) => nil)
+      (mock (create-image * nil t) => '(image foo))
+      (mock (copy-marker 7) => :my-marker )
+      (mock (url-retrieve
+             "http://example.org/image.png"
+             #'mastodon-media--process-image-response
+             '(:my-marker () 5 "http://example.org/image.png"))
+            => :called-as-expected)
+
+      (with-temp-buffer
+        (insert (concat "Start:"
+                        (mastodon-media--get-avatar-rendering url)
+                        ":rest"))
+        (let ((mastodon-media--preview-max-height 321))
+          (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'media-link 7 5))))))))
 
 (ert-deftest mastodon-media:load-image-from-url:url-fetching-fails ()
   "Should cope with failures in url-retrieve."
   (let ((url "http://example.org/image.png")
         (mastodon-media--avatar-height 123))
     (with-mock
-     (mock (image-type-available-p 'imagemagick) => t)
-     (mock (create-image
-            *
-            (when (version< emacs-version "27.1") 'imagemagick)
-            t :height 123) => '(image foo))
-     (stub url-retrieve => (error "url-retrieve failed"))
-
-     (with-temp-buffer
-       (insert (concat "Start:"
-                       (mastodon-media--get-avatar-rendering "http://example.org/img.png")
-                       ":rest"))
-
-       (should (eq :loading-failed (mastodon-media--load-image-from-url url 'avatar 7 1)))
-       ;; the media state was updated so we won't load this again: 
-       (should (eq 'loading-failed (get-text-property 7 'media-state)))))))
+      (mock (image-type-available-p 'imagemagick) => t)
+      (mock (create-image
+             *
+             (when (version< emacs-version "27.1") 'imagemagick)
+             t :height 123) => '(image foo))
+      (stub url-retrieve => (error "url-retrieve failed"))
+
+      (with-temp-buffer
+        (insert (concat "Start:"
+                        (mastodon-media--get-avatar-rendering "http://example.org/img.png")
+                        ":rest"))
+
+        (should (eq :loading-failed (mastodon-media--load-image-from-url url 'avatar 7 1)))
+        ;; the media state was updated so we won't load this again: 
+        (should (eq 'loading-failed (get-text-property 7 'media-state)))))))
 
 (ert-deftest mastodon-media:process-image-response ()
   "Should process the HTTP response and adjust the source buffer."
   (with-temp-buffer
     (with-mock
-     (let ((source-buffer (current-buffer))
-           used-marker
-           saved-marker)
-       (insert "start:")
-       (setq used-marker (copy-marker (point))
-             saved-marker (copy-marker (point)))
-       ;; Mock needed for the preliminary image created in
-       ;; mastodon-media--get-avatar-rendering
-       (stub create-image => :fake-image)
-       (insert (mastodon-media--get-avatar-rendering
-                "http://example.org/image.png.")
-               ":end")
-       (with-temp-buffer
-         (insert "some irrelevant\n"
-                 "http headers\n"
-                 "which will be ignored\n\n"
-                 "fake\nimage\ndata")
-         (goto-char (point-min))
-
-         (mock (create-image
-                "fake\nimage\ndata"
-                (when (version< emacs-version "27.1") 'imagemagick)
-                t ':image :option) => :fake-image)
-
-         (mastodon-media--process-image-response
-          () used-marker '(:image :option) 1 "http://example.org/image.png")
-
-         ;; the used marker has been unset:
-         (should (null (marker-position used-marker)))
-         ;; the media-state has been set to loaded and the image is being displayed
-         (should (eq 'loaded (get-text-property saved-marker 'media-state source-buffer)))
-         (should (eq ':fake-image (get-text-property saved-marker 'display source-buffer))))))))
+      (let ((source-buffer (current-buffer))
+            used-marker
+            saved-marker)
+        (insert "start:")
+        (setq used-marker (copy-marker (point))
+              saved-marker (copy-marker (point)))
+        ;; Mock needed for the preliminary image created in
+        ;; mastodon-media--get-avatar-rendering
+        (stub create-image => :fake-image)
+        (insert (mastodon-media--get-avatar-rendering
+                 "http://example.org/image.png.")
+                ":end")
+        (with-temp-buffer
+          (insert "some irrelevant\n"
+                  "http headers\n"
+                  "which will be ignored\n\n"
+                  "fake\nimage\ndata")
+          (goto-char (point-min))
+
+          (mock (create-image
+                 "fake\nimage\ndata"
+                 (when (version< emacs-version "27.1") 'imagemagick)
+                 t ':image :option) => :fake-image)
+
+          (mastodon-media--process-image-response
+           () used-marker '(:image :option) 1 "http://example.org/image.png")
+
+          ;; the used marker has been unset:
+          (should (null (marker-position used-marker)))
+          ;; the media-state has been set to loaded and the image is being displayed
+          (should (eq 'loaded (get-text-property saved-marker 'media-state source-buffer)))
+          (should (eq ':fake-image (get-text-property saved-marker 'display source-buffer))))))))
 
 (ert-deftest mastodon-media:inline-images ()
   "Should process all media in buffer."
   (with-mock
-   ;; Stub needed for the test setup:
-   (stub create-image => '(image ignored))
-
-   (let (marker-media-link marker-media-link-bad-url marker-false-media marker-avatar)
-     (with-temp-buffer
-       (insert "Some text before\n")
-       (setq marker-media-link (copy-marker (point)))
-       (insert (mastodon-media--get-media-link-rendering "http://example.org/i.jpg")
-               " some more text ")
-       (setq marker-media-link-bad-url (copy-marker (point)))
-       (insert (mastodon-media--get-media-link-rendering "/files/small/missing.png")
-               " some more text ")
-       (setq marker-false-media (copy-marker (point)))
-       (insert
-        ;; text that looks almost like an avatar but lacks the media-url property
-        (propertize "this won't be processed"
-                    'media-state 'needs-loading
-                    'media-type 'avatar)
-        "even more text ")
-       (setq marker-avatar (copy-marker (point)))
-       (insert (mastodon-media--get-avatar-rendering "http://example.org/avatar.png")
-               " end of text")
-       (goto-char (point-min))
-
-       ;; stub for the actual test:
-       (stub mastodon-media--load-image-from-url)
-       (mastodon-media--inline-images (point-min) (point-max))
-
-       (should (eq 'loading (get-text-property marker-media-link 'media-state)))
-       (should (eq 'invalid-url (get-text-property marker-media-link-bad-url 'media-state)))
-       (should (eq 'loading (get-text-property marker-avatar 'media-state)))
-       (should (eq 'needs-loading (get-text-property marker-false-media 'media-state)))))))
+    ;; Stub needed for the test setup:
+    (stub create-image => '(image ignored))
+
+    (let (marker-media-link marker-media-link-bad-url marker-false-media marker-avatar)
+      (with-temp-buffer
+        (insert "Some text before\n")
+        (setq marker-media-link (copy-marker (point)))
+        (insert (mastodon-media--get-media-link-rendering "http://example.org/i.jpg")
+                " some more text ")
+        (setq marker-media-link-bad-url (copy-marker (point)))
+        (insert (mastodon-media--get-media-link-rendering "/files/small/missing.png")
+                " some more text ")
+        (setq marker-false-media (copy-marker (point)))
+        (insert
+         ;; text that looks almost like an avatar but lacks the media-url property
+         (propertize "this won't be processed"
+                     'media-state 'needs-loading
+                     'media-type 'avatar)
+         "even more text ")
+        (setq marker-avatar (copy-marker (point)))
+        (insert (mastodon-media--get-avatar-rendering "http://example.org/avatar.png")
+                " end of text")
+        (goto-char (point-min))
+
+        ;; stub for the actual test:
+        (stub mastodon-media--load-image-from-url)
+        (mastodon-media--inline-images (point-min) (point-max))
+
+        (should (eq 'loading (get-text-property marker-media-link 'media-state)))
+        (should (eq 'invalid-url (get-text-property marker-media-link-bad-url 'media-state)))
+        (should (eq 'loading (get-text-property marker-avatar 'media-state)))
+        (should (eq 'needs-loading (get-text-property marker-false-media 'media-state)))))))
diff --git a/test/mastodon-notifications-test.el b/test/mastodon-notifications-test.el
index 3047ae6..778d350 100644
--- a/test/mastodon-notifications-test.el
+++ b/test/mastodon-notifications-test.el
@@ -185,8 +185,8 @@
   "Ensure get request format for notifictions is accurate."
   (let ((mastodon-instance-url "https://instance.url"))
     (with-mock
-     (mock (mastodon-http--get-json "https://instance.url/api/v1/notifications" ))
-     (mastodon-notifications--get))))
+      (mock (mastodon-http--get-json "https://instance.url/api/v1/notifications" ))
+      (mastodon-notifications--get))))
 
 (defun mastodon-notifications--test-type (fun sample)
   "Test notification draw functions.
diff --git a/test/mastodon-search-tests.el b/test/mastodon-search-tests.el
index b8521f3..552f467 100644
--- a/test/mastodon-search-tests.el
+++ b/test/mastodon-search-tests.el
@@ -38,7 +38,15 @@
   "A sample mastodon account search result (parsed json)")
 
 (defconst mastodon-search-test-single-tag
-  '((name . "TeamBringBackVisibleScrollbars") (url . "https://todon.nl/tags/TeamBringBackVisibleScrollbars") (history . [((day . "1636156800") (uses . "0") (accounts . "0")) ((day . "1636070400") (uses . "0") (accounts . "0")) ((day . "1635984000") (uses . "0") (accounts . "0")) ((day . "1635897600") (uses . "0") (accounts . "0")) ((day . "1635811200") (uses . "0") (accounts . "0")) ((day . "1635724800") (uses . "0") (accounts . "0")) ((day . "1635638400") (uses . "0") (accounts . "0"))])))
+  '((name . "TeamBringBackVisibleScrollbars")
+    (url . "https://todon.nl/tags/TeamBringBackVisibleScrollbars")
+    (history . [((day . "1636156800") (uses . "0") (accounts . "0"))
+                ((day . "1636070400") (uses . "0") (accounts . "0"))
+                ((day . "1635984000") (uses . "0") (accounts . "0"))
+                ((day . "1635897600") (uses . "0") (accounts . "0"))
+                ((day . "1635811200") (uses . "0") (accounts . "0"))
+                ((day . "1635724800") (uses . "0") (accounts . "0"))
+                ((day . "1635638400") (uses . "0") (accounts . "0"))])))
 
 (defconst mastodon-search-test-single-status
   '((id . "107230316503209282")
@@ -83,59 +91,57 @@
      (following_count . 634)
      (statuses_count . 3807)
      (last_status_at . "2021-11-05")
-     (emojis .
-             [])
-     (fields .
-             [((name . "dark to")
-               (value . "themselves")
-               (verified_at))
-              ((name . "its raining")
-               (value . "plastic")
-               (verified_at))
-              ((name . "dis")
-               (value . "integration")
-               (verified_at))
-              ((name . "ungleichzeitigkeit und")
-               (value . "gleichzeitigkeit, philosophisch")
-               (verified_at))]))
-    (media_attachments .
-                       [])
-    (mentions .
-              [((id . "242971")
-                (username . "mousebot")
-                (url . "https://todon.nl/@mousebot")
-                (acct . "mousebot"))])
-    (tags .
-          [])
-    (emojis .
-            [])
+     (emojis . [])
+     (fields . [((name . "dark to")
+                 (value . "themselves")
+                 (verified_at))
+                ((name . "its raining")
+                 (value . "plastic")
+                 (verified_at))
+                ((name . "dis")
+                 (value . "integration")
+                 (verified_at))
+                ((name . "ungleichzeitigkeit und")
+                 (value . "gleichzeitigkeit, philosophisch")
+                 (verified_at))]))
+    (media_attachments . [])
+    (mentions . [((id . "242971")
+                  (username . "mousebot")
+                  (url . "https://todon.nl/@mousebot")
+                  (acct . "mousebot"))])
+    (tags . [])
+    (emojis . [])
     (card)
     (poll)))
 
 (ert-deftest mastodon-search-test-get-user-info-@ ()
   "Should build a list from a single account for company completion."
-  (let ((account mastodon-search--single-account-query))
-    (should (equal (mastodon-search--get-user-info-@ account)
-                   '(": ( ) { : | : & } ; :" "@mousebot" "https://todon.nl/@mousebot")))))
+  (should
+   (equal
+    (mastodon-search--get-user-info-@ mastodon-search--single-account-query)
+    '(": ( ) { : | : & } ; :" "@mousebot" "https://todon.nl/@mousebot"))))
 
 (ert-deftest mastodon-search-test-get-user-info ()
   "Should build a list from a single account for company completion."
-  (let ((account mastodon-search--single-account-query))
-    (should (equal (mastodon-search--get-user-info account)
-                   '(": ( ) { : | : & } ; :" "mousebot" "https://todon.nl/@mousebot")))))
+  (should
+   (equal
+    (mastodon-search--get-user-info mastodon-search--single-account-query)
+    '(": ( ) { : | : & } ; :" "mousebot" "https://todon.nl/@mousebot"))))
 
 (ert-deftest mastodon-search-test-get-hashtag-info ()
   "Should build a list of hashtag name and URL."
-  (let ((tag mastodon-search-test-single-tag))
-    (should (equal (mastodon-search--get-hashtag-info tag)
-                   '("TeamBringBackVisibleScrollbars"
-                     "https://todon.nl/tags/TeamBringBackVisibleScrollbars")))))
+  (should
+   (equal
+    (mastodon-search--get-hashtag-info mastodon-search-test-single-tag)
+    '("TeamBringBackVisibleScrollbars"
+      "https://todon.nl/tags/TeamBringBackVisibleScrollbars"))))
 
 (ert-deftest mastodon-search-test-get-status-info ()
   "Should return a list of ID, timestamp, content, and spoiler."
-  (let ((status mastodon-search-test-single-status))
-    (should (equal (mastodon-search--get-status-info status)
-                   '("107230316503209282"
-                     "2021-11-06T13:19:40.628Z"
-                     ""
-                     "<p>This is a nice test toot, for testing purposes. Thank you.</p>")))))
+  (should
+   (equal
+    (mastodon-search--get-status-info mastodon-search-test-single-status)
+    '("107230316503209282"
+      "2021-11-06T13:19:40.628Z"
+      ""
+      "<p>This is a nice test toot, for testing purposes. Thank you.</p>"))))
diff --git a/test/mastodon-tl-tests.el b/test/mastodon-tl-tests.el
index 4edf5d5..e4606cc 100644
--- a/test/mastodon-tl-tests.el
+++ b/test/mastodon-tl-tests.el
@@ -125,8 +125,8 @@
   "Should request toots older than max_id."
   (let ((mastodon-instance-url "https://instance.url"))
     (with-mock
-     (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?max_id=12345"))
-     (mastodon-tl--more-json "timelines/foo" 12345))))
+      (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?max_id=12345"))
+      (mastodon-tl--more-json "timelines/foo" 12345))))
 
 (ert-deftest more-json-id-string ()
   "Should request toots older than max_id.
@@ -135,8 +135,8 @@
 a string or a numeric."
   (let ((mastodon-instance-url "https://instance.url"))
     (with-mock
-     (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?max_id=12345"))
-     (mastodon-tl--more-json "timelines/foo" "12345"))))
+      (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?max_id=12345"))
+      (mastodon-tl--more-json "timelines/foo" "12345"))))
 
 (ert-deftest update-json-id-string ()
   "Should request toots more recent than since_id.
@@ -145,8 +145,8 @@ a string or a numeric."
 a string or a numeric."
   (let ((mastodon-instance-url "https://instance.url"))
     (with-mock
-     (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?since_id=12345"))
-     (mastodon-tl--updated-json "timelines/foo" "12345"))))
+      (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?since_id=12345"))
+      (mastodon-tl--updated-json "timelines/foo" "12345"))))
 
 (ert-deftest mastodon-tl--relative-time-description ()
   "Should format relative time as expected"
@@ -253,39 +253,39 @@ a string or a numeric."
   (let ((mastodon-tl--show-avatars-p nil)
         (timestamp (cdr (assoc 'created_at mastodon-tl-test-base-toot))))
     (with-mock
-     (mock (date-to-time timestamp) => '(22782 21551))
-     (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
-
-     (let ((byline (mastodon-tl--byline mastodon-tl-test-base-toot
-                                        'mastodon-tl--byline-author
-                                        'mastodon-tl--byline-boosted))
-	   (handle-location 20))
-       (should (string= (substring-no-properties
-			 byline)
-			"Account 42 (@acct42@example.space) 2999-99-99 00:11:22
+      (mock (date-to-time timestamp) => '(22782 21551))
+      (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
+
+      (let ((byline (mastodon-tl--byline mastodon-tl-test-base-toot
+                                         'mastodon-tl--byline-author
+                                         'mastodon-tl--byline-boosted))
+	    (handle-location 20))
+        (should (string= (substring-no-properties
+			  byline)
+			 "Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
 "))
-       (should (eq (get-text-property handle-location 'mastodon-tab-stop byline)
-                   'user-handle))
-       (should (string= (get-text-property handle-location 'mastodon-handle byline)
-                        "@acct42@example.space"))
-       (should (equal (get-text-property handle-location 'help-echo byline)
-                      "Browse user profile of @acct42@example.space"))))))
+        (should (eq (get-text-property handle-location 'mastodon-tab-stop byline)
+                    'user-handle))
+        (should (string= (get-text-property handle-location 'mastodon-handle byline)
+                         "@acct42@example.space"))
+        (should (equal (get-text-property handle-location 'help-echo byline)
+                       "Browse user profile of @acct42@example.space"))))))
 
 (ert-deftest mastodon-tl--byline-regular-with-avatar ()
   "Should format the regular toot correctly."
   (let ((mastodon-tl--show-avatars-p t)
         (timestamp (cdr (assoc 'created_at mastodon-tl-test-base-toot))))
     (with-mock
-     (stub create-image => '(image "fake data"))
-     (mock (date-to-time timestamp) => '(22782 21551))
-     (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
-
-     (should (string= (substring-no-properties
-                       (mastodon-tl--byline mastodon-tl-test-base-toot
-                                            'mastodon-tl--byline-author
-                                            'mastodon-tl--byline-boosted))
-                      "Account 42 (@acct42@example.space) 2999-99-99 00:11:22
+      (stub create-image => '(image "fake data"))
+      (mock (date-to-time timestamp) => '(22782 21551))
+      (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
+
+      (should (string= (substring-no-properties
+                        (mastodon-tl--byline mastodon-tl-test-base-toot
+                                             'mastodon-tl--byline-author
+                                             'mastodon-tl--byline-boosted))
+                       "Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
 ")))))
 
@@ -295,14 +295,14 @@ a string or a numeric."
          (toot (cons '(reblogged . t) mastodon-tl-test-base-toot))
          (timestamp (cdr (assoc 'created_at toot))))
     (with-mock
-     (mock (date-to-time timestamp) => '(22782 21551))
-     (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
-
-     (should (string= (substring-no-properties
-                       (mastodon-tl--byline toot
-                                            'mastodon-tl--byline-author
-                                            'mastodon-tl--byline-boosted))
-                      "(B) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
+      (mock (date-to-time timestamp) => '(22782 21551))
+      (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
+
+      (should (string= (substring-no-properties
+                        (mastodon-tl--byline toot
+                                             'mastodon-tl--byline-author
+                                             'mastodon-tl--byline-boosted))
+                       "(B) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
 ")))))
 
@@ -312,14 +312,14 @@ a string or a numeric."
          (toot (cons '(favourited . t) mastodon-tl-test-base-toot))
          (timestamp (cdr (assoc 'created_at toot))))
     (with-mock
-     (mock (date-to-time timestamp) => '(22782 21551))
-     (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
-
-     (should (string= (substring-no-properties
-                       (mastodon-tl--byline toot
-                                            'mastodon-tl--byline-author
-                                            'mastodon-tl--byline-boosted))
-                      "(F) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
+      (mock (date-to-time timestamp) => '(22782 21551))
+      (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
+
+      (should (string= (substring-no-properties
+                        (mastodon-tl--byline toot
+                                             'mastodon-tl--byline-author
+                                             'mastodon-tl--byline-boosted))
+                       "(F) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
 ")))))
 
@@ -330,14 +330,14 @@ a string or a numeric."
          (toot `((favourited . t) (reblogged . t) ,@mastodon-tl-test-base-toot))
          (timestamp (cdr (assoc 'created_at toot))))
     (with-mock
-     (mock (date-to-time timestamp) => '(22782 21551))
-     (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
-
-     (should (string= (substring-no-properties
-                       (mastodon-tl--byline toot
-                                            'mastodon-tl--byline-author
-                                            'mastodon-tl--byline-boosted))
-                      "(B) (F) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
+      (mock (date-to-time timestamp) => '(22782 21551))
+      (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
+
+      (should (string= (substring-no-properties
+                        (mastodon-tl--byline toot
+                                             'mastodon-tl--byline-author
+                                             'mastodon-tl--byline-boosted))
+                       "(B) (F) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
 ")))))
 
@@ -349,31 +349,31 @@ a string or a numeric."
          (timestamp (cdr (assoc 'created_at toot)))
          (original-timestamp (cdr (assoc 'created_at original-toot))))
     (with-mock
-     ;; We don't expect to use the toot's timestamp but the timestamp of the
-     ;; reblogged toot:
-     (mock (date-to-time timestamp) => '(1 2))
-     (mock (format-time-string mastodon-toot-timestamp-format '(1 2)) => "reblogging time")
-     (mock (date-to-time original-timestamp) => '(3 4))
-     (mock (format-time-string mastodon-toot-timestamp-format '(3 4)) => "original time")
-
-     (let ((byline (mastodon-tl--byline toot
-					'mastodon-tl--byline-author
-					'mastodon-tl--byline-boosted))
-	   (handle1-location 20)
-	   (handle2-location 65))
-       (should (string= (substring-no-properties byline)
-			"Account 42 (@acct42@example.space)
+      ;; We don't expect to use the toot's timestamp but the timestamp of the
+      ;; reblogged toot:
+      (mock (date-to-time timestamp) => '(1 2))
+      (mock (format-time-string mastodon-toot-timestamp-format '(1 2)) => "reblogging time")
+      (mock (date-to-time original-timestamp) => '(3 4))
+      (mock (format-time-string mastodon-toot-timestamp-format '(3 4)) => "original time")
+
+      (let ((byline (mastodon-tl--byline toot
+					 'mastodon-tl--byline-author
+					 'mastodon-tl--byline-boosted))
+	    (handle1-location 20)
+	    (handle2-location 65))
+        (should (string= (substring-no-properties byline)
+			 "Account 42 (@acct42@example.space)
  Boosted Account 43 (@acct43@example.space) original time
   ------------
 "))
-       (should (eq (get-text-property handle1-location 'mastodon-tab-stop byline)
-                   'user-handle))
-       (should (equal (get-text-property handle1-location 'help-echo byline)
-		      "Browse user profile of @acct42@example.space"))
-       (should (eq (get-text-property handle2-location 'mastodon-tab-stop byline)
-                   'user-handle))
-       (should (equal (get-text-property handle2-location 'help-echo byline)
-                      "Browse user profile of @acct43@example.space"))))))
+        (should (eq (get-text-property handle1-location 'mastodon-tab-stop byline)
+                    'user-handle))
+        (should (equal (get-text-property handle1-location 'help-echo byline)
+		       "Browse user profile of @acct42@example.space"))
+        (should (eq (get-text-property handle2-location 'mastodon-tab-stop byline)
+                    'user-handle))
+        (should (equal (get-text-property handle2-location 'help-echo byline)
+                       "Browse user profile of @acct43@example.space"))))))
 
 (ert-deftest mastodon-tl--byline-reblogged-with-avatars ()
   "Should format the reblogged toot correctly."
@@ -383,19 +383,19 @@ a string or a numeric."
          (timestamp (cdr (assoc 'created_at toot)))
          (original-timestamp (cdr (assoc 'created_at original-toot))))
     (with-mock
-     ;; We don't expect to use the toot's timestamp but the timestamp of the
-     ;; reblogged toot:
-     (stub create-image => '(image "fake data"))
-     (mock (date-to-time timestamp) => '(1 2))
-     (mock (format-time-string mastodon-toot-timestamp-format '(1 2)) => "reblogging time")
-     (mock (date-to-time original-timestamp) => '(3 4))
-     (mock (format-time-string mastodon-toot-timestamp-format '(3 4)) => "original time")
-
-     (should (string= (substring-no-properties
-                       (mastodon-tl--byline toot
-                                            'mastodon-tl--byline-author
-                                            'mastodon-tl--byline-boosted))
-                      "Account 42 (@acct42@example.space)
+      ;; We don't expect to use the toot's timestamp but the timestamp of the
+      ;; reblogged toot:
+      (stub create-image => '(image "fake data"))
+      (mock (date-to-time timestamp) => '(1 2))
+      (mock (format-time-string mastodon-toot-timestamp-format '(1 2)) => "reblogging time")
+      (mock (date-to-time original-timestamp) => '(3 4))
+      (mock (format-time-string mastodon-toot-timestamp-format '(3 4)) => "original time")
+
+      (should (string= (substring-no-properties
+                        (mastodon-tl--byline toot
+                                             'mastodon-tl--byline-author
+                                             'mastodon-tl--byline-boosted))
+                       "Account 42 (@acct42@example.space)
  Boosted Account 43 (@acct43@example.space) original time
   ------------
 ")))))
@@ -408,18 +408,18 @@ a string or a numeric."
          (timestamp (cdr (assoc 'created_at toot)))
          (original-timestamp (cdr (assoc 'created_at original-toot))))
     (with-mock
-     ;; We don't expect to use the toot's timestamp but the timestamp of the
-     ;; reblogged toot:
-     (mock (date-to-time timestamp) => '(1 2))
-     (mock (format-time-string mastodon-toot-timestamp-format '(1 2)) => "reblogging time")
-     (mock (date-to-time original-timestamp) => '(3 4))
-     (mock (format-time-string mastodon-toot-timestamp-format '(3 4)) => "original time")
-
-     (should (string= (substring-no-properties
-                       (mastodon-tl--byline toot
-                                            'mastodon-tl--byline-author
-                                            'mastodon-tl--byline-boosted))
-                      "(B) (F) Account 42 (@acct42@example.space)
+      ;; We don't expect to use the toot's timestamp but the timestamp of the
+      ;; reblogged toot:
+      (mock (date-to-time timestamp) => '(1 2))
+      (mock (format-time-string mastodon-toot-timestamp-format '(1 2)) => "reblogging time")
+      (mock (date-to-time original-timestamp) => '(3 4))
+      (mock (format-time-string mastodon-toot-timestamp-format '(3 4)) => "original time")
+
+      (should (string= (substring-no-properties
+                        (mastodon-tl--byline toot
+                                             'mastodon-tl--byline-author
+                                             'mastodon-tl--byline-boosted))
+                       "(B) (F) Account 42 (@acct42@example.space)
  Boosted Account 43 (@acct43@example.space) original time
   ------------
 ")))))
@@ -429,17 +429,17 @@ a string or a numeric."
   (let ((mastodon-tl--show-avatars-p nil)
         (timestamp (cdr (assoc 'created_at mastodon-tl-test-base-toot))))
     (with-mock
-     (mock (date-to-time timestamp) => '(22782 21551))
-     (mock (current-time) => '(22782 22000))
-     (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
-
-     (let* ((formatted-string (mastodon-tl--byline mastodon-tl-test-base-toot
-                                                   'mastodon-tl--byline-author
-                                                   'mastodon-tl--byline-boosted))
-            (timestamp-start (string-match "2999-99-99" formatted-string))
-            (properties (text-properties-at timestamp-start formatted-string)))
-       (should (equal '(22782 21551) (plist-get properties 'timestamp)))
-       (should (string-equal "7 minutes ago" (plist-get properties 'display)))))))
+      (mock (date-to-time timestamp) => '(22782 21551))
+      (mock (current-time) => '(22782 22000))
+      (mock (format-time-string mastodon-toot-timestamp-format '(22782 21551)) => "2999-99-99 00:11:22")
+
+      (let* ((formatted-string (mastodon-tl--byline mastodon-tl-test-base-toot
+                                                    'mastodon-tl--byline-author
+                                                    'mastodon-tl--byline-boosted))
+             (timestamp-start (string-match "2999-99-99" formatted-string))
+             (properties (text-properties-at timestamp-start formatted-string)))
+        (should (equal '(22782 21551) (plist-get properties 'timestamp)))
+        (should (string-equal "7 minutes ago" (plist-get properties 'display)))))))
 
 (ert-deftest mastodon-tl--consider-timestamp-for-updates-no-active-callback ()
   "Should update the timestamp update variables as expected."
@@ -454,33 +454,33 @@ a string or a numeric."
 
       ;; something a later update doesn't update:
       (with-mock
-       (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
-             (cons "xxx ago" (time-add long-in-the-future (seconds-to-time 100))))
+        (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
+              (cons "xxx ago" (time-add long-in-the-future (seconds-to-time 100))))
 
-       (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
+        (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
 
-       (should (null mastodon-tl--timestamp-update-timer))
-       (should (eq mastodon-tl--timestamp-next-update long-in-the-future)))
+        (should (null mastodon-tl--timestamp-update-timer))
+        (should (eq mastodon-tl--timestamp-next-update long-in-the-future)))
 
       ;; something only shortly sooner doesn't update:
       (with-mock
-       (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
-             (cons "xxx ago" (time-subtract long-in-the-future (seconds-to-time 9))))
+        (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
+              (cons "xxx ago" (time-subtract long-in-the-future (seconds-to-time 9))))
 
-       (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
+        (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
 
-       (should (null mastodon-tl--timestamp-update-timer))
-       (should (eq mastodon-tl--timestamp-next-update long-in-the-future)))
+        (should (null mastodon-tl--timestamp-update-timer))
+        (should (eq mastodon-tl--timestamp-next-update long-in-the-future)))
 
       ;; something much sooner, does update
       (with-mock
-       (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
-             (cons "xxx ago"  soon-in-the-future))
+        (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
+              (cons "xxx ago"  soon-in-the-future))
 
-       (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
+        (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
 
-       (should (null mastodon-tl--timestamp-update-timer))
-       (should (eq mastodon-tl--timestamp-next-update soon-in-the-future)))
+        (should (null mastodon-tl--timestamp-update-timer))
+        (should (eq mastodon-tl--timestamp-next-update soon-in-the-future)))
       )))
 
 (ert-deftest mastodon-tl--consider-timestamp-for-updates-with-active-callback ()
@@ -496,27 +496,27 @@ a string or a numeric."
 
       ;; something a later update doesn't update:
       (with-mock
-       (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
-             (cons "xxx ago" (time-add long-in-the-future (seconds-to-time 100))))
+        (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
+              (cons "xxx ago" (time-add long-in-the-future (seconds-to-time 100))))
 
-       (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
+        (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
 
-       (should (eq 'initial-timer mastodon-tl--timestamp-update-timer))
-       (should (eq mastodon-tl--timestamp-next-update long-in-the-future)))
+        (should (eq 'initial-timer mastodon-tl--timestamp-update-timer))
+        (should (eq mastodon-tl--timestamp-next-update long-in-the-future)))
 
       ;; something much sooner, does update
       (with-mock
-       (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
-             (cons "xxx ago"  soon-in-the-future))
-       (mock (cancel-timer 'initial-timer))
-       (mock (run-at-time soon-in-the-future nil
-                          #'mastodon-tl--update-timestamps-callback
-                          (current-buffer) nil) => 'new-timer)
+        (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
+              (cons "xxx ago"  soon-in-the-future))
+        (mock (cancel-timer 'initial-timer))
+        (mock (run-at-time soon-in-the-future nil
+                           #'mastodon-tl--update-timestamps-callback
+                           (current-buffer) nil) => 'new-timer)
 
-       (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
+        (mastodon-tl--consider-timestamp-for-updates 'fake-timestamp)
 
-       (should (eq 'new-timer mastodon-tl--timestamp-update-timer))
-       (should (eq mastodon-tl--timestamp-next-update soon-in-the-future)))
+        (should (eq 'new-timer mastodon-tl--timestamp-update-timer))
+        (should (eq mastodon-tl--timestamp-next-update soon-in-the-future)))
       )))
 
 (ert-deftest mastodon-tl--find-property-range--no-tag ()
@@ -691,20 +691,20 @@ a string or a numeric."
                    (list 'r3 r3 r2 r3)
                    (list 'end end r3 end))))
         (with-mock
-         (stub message => nil) ;; don't mess up our test output with the function's messages
-         (cl-dolist (test test-cases)
-           (let ((test-name (cl-first test))
-                 (test-start (cl-second test))
-                 (expected-prev (cl-third test))
-                 (expected-next (cl-fourth test)))
-             (goto-char test-start)
-             (mastodon-tl--previous-tab-item)
-             (should (equal (list 'prev test-name expected-prev)
-                            (list 'prev test-name (point))))
-             (goto-char test-start)
-             (mastodon-tl--next-tab-item)
-             (should (equal (list 'next test-name expected-next)
-                            (list 'next test-name (point)))))))))))
+          (stub message => nil) ;; don't mess up our test output with the function's messages
+          (cl-dolist (test test-cases)
+            (let ((test-name (cl-first test))
+                  (test-start (cl-second test))
+                  (expected-prev (cl-third test))
+                  (expected-next (cl-fourth test)))
+              (goto-char test-start)
+              (mastodon-tl--previous-tab-item)
+              (should (equal (list 'prev test-name expected-prev)
+                             (list 'prev test-name (point))))
+              (goto-char test-start)
+              (mastodon-tl--next-tab-item)
+              (should (equal (list 'next test-name expected-next)
+                             (list 'next test-name (point)))))))))))
 
 (ert-deftest mastodon-tl--next-tab-item--no-spaces-at-ends ()
   "Should do the correct tab actions even with regions right at buffer ends."
@@ -739,20 +739,20 @@ a string or a numeric."
                    (list 'gap2 gap2 r3 r4)
                    (list 'r4 r4 r3 r4))))
         (with-mock
-         (stub message => nil) ;; don't mess up our test output with the function's messages
-         (cl-dolist (test test-cases)
-           (let ((test-name (cl-first test))
-                 (test-start (cl-second test))
-                 (expected-prev (cl-third test))
-                 (expected-next (cl-fourth test)))
-             (goto-char test-start)
-             (mastodon-tl--previous-tab-item)
-             (should (equal (list 'prev test-name expected-prev)
-                            (list 'prev test-name (point))))
-             (goto-char test-start)
-             (mastodon-tl--next-tab-item)
-             (should (equal (list 'next test-name expected-next)
-                            (list 'next test-name (point)))))))))))
+          (stub message => nil) ;; don't mess up our test output with the function's messages
+          (cl-dolist (test test-cases)
+            (let ((test-name (cl-first test))
+                  (test-start (cl-second test))
+                  (expected-prev (cl-third test))
+                  (expected-next (cl-fourth test)))
+              (goto-char test-start)
+              (mastodon-tl--previous-tab-item)
+              (should (equal (list 'prev test-name expected-prev)
+                             (list 'prev test-name (point))))
+              (goto-char test-start)
+              (mastodon-tl--next-tab-item)
+              (should (equal (list 'next test-name expected-next)
+                             (list 'next test-name (point)))))))))))
 
 
 (defun tl-tests--property-values-at (property ranges)
@@ -781,33 +781,33 @@ constant."
         (setq markers (nreverse markers))
 
         (with-mock
-         (mock (current-time) => now)
-         (stub run-at-time => 'fake-timer)
-
-         ;; make the initial call
-         (mastodon-tl--update-timestamps-callback (current-buffer) nil)
-         (should (equal '("2 minutes ago" "3 minutes ago" "4 minutes ago" "5 minutes ago" "6 minutes ago"
-                          "unset 7" "unset 8" "unset 9" "unset 10" "unset 11" "unset 12" "unset 13")
-                        (tl-tests--property-values-at 'display
-                                                      (tl-tests--all-regions-with-property 'timestamp))))
-
-         ;; fake the follow-up call
-         (mastodon-tl--update-timestamps-callback (current-buffer) (nth 4 markers))
-         (should (equal '("2 minutes ago" "3 minutes ago" "4 minutes ago" "5 minutes ago" "6 minutes ago"
-                          "7 minutes ago" "8 minutes ago" "9 minutes ago" "10 minutes ago" "11 minutes ago"
-                          "unset 12" "unset 13")
-                        (tl-tests--property-values-at 'display
-                                                      (tl-tests--all-regions-with-property 'timestamp))))
-         (should (null (marker-position (nth 4 markers))))
-
-         ;; fake the follow-up call
-         (mastodon-tl--update-timestamps-callback (current-buffer) (nth 9 markers))
-         (should (equal '("2 minutes ago" "3 minutes ago" "4 minutes ago" "5 minutes ago" "6 minutes ago"
-                          "7 minutes ago" "8 minutes ago" "9 minutes ago" "10 minutes ago" "11 minutes ago"
-                          "12 minutes ago" "13 minutes ago")
-                        (tl-tests--property-values-at 'display
-                                                      (tl-tests--all-regions-with-property 'timestamp))))
-         (should (null (marker-position (nth 9 markers)))))))))
+          (mock (current-time) => now)
+          (stub run-at-time => 'fake-timer)
+
+          ;; make the initial call
+          (mastodon-tl--update-timestamps-callback (current-buffer) nil)
+          (should (equal '("2 minutes ago" "3 minutes ago" "4 minutes ago" "5 minutes ago" "6 minutes ago"
+                           "unset 7" "unset 8" "unset 9" "unset 10" "unset 11" "unset 12" "unset 13")
+                         (tl-tests--property-values-at 'display
+                                                       (tl-tests--all-regions-with-property 'timestamp))))
+
+          ;; fake the follow-up call
+          (mastodon-tl--update-timestamps-callback (current-buffer) (nth 4 markers))
+          (should (equal '("2 minutes ago" "3 minutes ago" "4 minutes ago" "5 minutes ago" "6 minutes ago"
+                           "7 minutes ago" "8 minutes ago" "9 minutes ago" "10 minutes ago" "11 minutes ago"
+                           "unset 12" "unset 13")
+                         (tl-tests--property-values-at 'display
+                                                       (tl-tests--all-regions-with-property 'timestamp))))
+          (should (null (marker-position (nth 4 markers))))
+
+          ;; fake the follow-up call
+          (mastodon-tl--update-timestamps-callback (current-buffer) (nth 9 markers))
+          (should (equal '("2 minutes ago" "3 minutes ago" "4 minutes ago" "5 minutes ago" "6 minutes ago"
+                           "7 minutes ago" "8 minutes ago" "9 minutes ago" "10 minutes ago" "11 minutes ago"
+                           "12 minutes ago" "13 minutes ago")
+                         (tl-tests--property-values-at 'display
+                                                       (tl-tests--all-regions-with-property 'timestamp))))
+          (should (null (marker-position (nth 9 markers)))))))))
 
 (ert-deftest mastodon-tl--has-spoiler ()
   "Should be able to detect toots with spoiler text as expected"
@@ -833,10 +833,10 @@ constant."
       (insert "some text before\n")
       (setq toot-start (point))
       (with-mock
-       (stub create-image => '(image "fake data"))
-       (stub shr-render-region => nil) ;; Travis's Emacs doesn't have libxml
-       (insert
-        (mastodon-tl--spoiler normal-toot-with-spoiler)))
+        (stub create-image => '(image "fake data"))
+        (stub shr-render-region => nil) ;; Travis's Emacs doesn't have libxml
+        (insert
+         (mastodon-tl--spoiler normal-toot-with-spoiler)))
       (setq toot-end (point))
       (insert "\nsome more text.")
       (add-text-properties
@@ -899,10 +899,10 @@ constant."
                    'help-echo "https://example.space/tags/sampletag")
                   " some text after"))
          (rendered (with-mock
-                    (stub shr-render-region => nil)
-                    (mastodon-tl--render-text
-                     fake-input-text
-                     mastodon-tl-test-base-toot)))
+                     (stub shr-render-region => nil)
+                     (mastodon-tl--render-text
+                      fake-input-text
+                      mastodon-tl-test-base-toot)))
          (tag-location 7))
     (should (eq (get-text-property tag-location 'mastodon-tab-stop rendered)
                 'hashtag))
@@ -946,10 +946,10 @@ constant."
                    'help-echo "https://bar.example/@foo")
                   " some text after"))
          (rendered (with-mock
-                    (stub shr-render-region => nil)
-                    (mastodon-tl--render-text
-                     fake-input-text
-                     mastodon-tl-test-base-toot)))
+                     (stub shr-render-region => nil)
+                     (mastodon-tl--render-text
+                      fake-input-text
+                      mastodon-tl-test-base-toot)))
          (mention-location 11))
     (should (eq (get-text-property mention-location 'mastodon-tab-stop rendered)
                 'user-handle))
diff --git a/test/mastodon-toot-tests.el b/test/mastodon-toot-tests.el
index abc66d0..06da870 100644
--- a/test/mastodon-toot-tests.el
+++ b/test/mastodon-toot-tests.el
@@ -41,6 +41,6 @@
 
 (ert-deftest cancel ()
   (with-mock
-   (mock (kill-buffer-and-window))
-   (mastodon-toot--cancel)
-   (mock-verify)))
+    (mock (kill-buffer-and-window))
+    (mastodon-toot--cancel)
+    (mock-verify)))
-- 
cgit v1.2.3


From 522926bcca0caf45516da3dcd00c944066641965 Mon Sep 17 00:00:00 2001
From: Holger Dürer <me@hdurer.net>
Date: Tue, 9 Nov 2021 18:24:54 +0100
Subject: Hamonize tests.

- Add a header comment explicitly switching off lexical binding
- Harmonize naming (always start with module and double hyphen)
- Ensure all tests have at least a minimal doc string.
- Move tests from `mastodon-auth-test.el` to `mastodon-auth-tests.el`
---
 test/mastodon-auth-test.el          | 59 -------------------------------------
 test/mastodon-auth-tests.el         | 59 ++++++++++++++++++++++++++++++-------
 test/mastodon-client-tests.el       | 26 ++++++++--------
 test/mastodon-http-tests.el         | 13 ++++----
 test/mastodon-media-tests.el        | 20 +++++++------
 test/mastodon-notifications-test.el | 14 +++++----
 test/mastodon-search-tests.el       | 18 +++++------
 test/mastodon-tl-tests.el           | 27 +++++++++++------
 test/mastodon-toot-tests.el         | 25 +++++++++++-----
 9 files changed, 134 insertions(+), 127 deletions(-)
 delete mode 100644 test/mastodon-auth-test.el

(limited to 'test')

diff --git a/test/mastodon-auth-test.el b/test/mastodon-auth-test.el
deleted file mode 100644
index 4372047..0000000
--- a/test/mastodon-auth-test.el
+++ /dev/null
@@ -1,59 +0,0 @@
-;;; mastodon-auth--test.el --- Tests for mastodon-auth  -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2020  Ian Eure
-
-;; Author: Ian Eure <ian@retrospec.tv>
-;; Version: 0.9.1
-;; Homepage: https://github.com/jdenen/mastodon.el
-;; Package-Requires: ((emacs "26.1"))
-
-;; This file is not part of GNU Emacs.
-
-;; This file is part of mastodon.el.
-
-;; This program 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.
-
-;; This program 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 this program.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; mastodon-auth--test.el provides ERT tests for mastodon-auth.el
-
-;;; Code:
-
-(require 'ert)
-
-(ert-deftest mastodon-auth--handle-token-response--good ()
-  (should (string= "foo" (mastodon-auth--handle-token-response '(:access_token "foo" :token_type "Bearer" :scope "read write follow" :created_at 0)))))
-
-(ert-deftest mastodon-auth--handle-token-response--unknown ()
-  (should
-   (equal
-    '(error "Unknown response from mastodon-auth--get-token!")
-    (condition-case error
-        (progn
-          (mastodon-auth--handle-token-response '(:herp "derp"))
-          nil)
-      (t error)))))
-
-(ert-deftest mastodon-auth--handle-token-response--failure ()
-  (let ((error-message "The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client."))
-    (should
-     (equal
-      `(error ,(format "Mastodon-auth--access-token: invalid_grant: %s" error-message))
-      (condition-case error
-          (mastodon-auth--handle-token-response
-           `(:error "invalid_grant" :error_description ,error-message))
-        (t error))))))
-
-(provide 'mastodon-auth--test)
-;;; mastodon-auth--test.el ends here
diff --git a/test/mastodon-auth-tests.el b/test/mastodon-auth-tests.el
index fda04eb..6a090b7 100644
--- a/test/mastodon-auth-tests.el
+++ b/test/mastodon-auth-tests.el
@@ -1,6 +1,38 @@
+;;; mastodon-auth-test.el --- Tests for mastodon-auth.el  -*- lexical-binding: nil -*-
+
 (require 'el-mock)
 
-(ert-deftest generate-token--no-storing-credentials ()
+(ert-deftest mastodon-auth--handle-token-response--good ()
+  "Should extract the access token from a good response."
+  (should
+   (string=
+    "foo"
+    (mastodon-auth--handle-token-response
+     '(:access_token "foo" :token_type "Bearer" :scope "read write follow" :created_at 0)))))
+
+(ert-deftest mastodon-auth--handle-token-response--unknown ()
+  "Should throw an error when the response is unparsable."
+  (should
+   (equal
+    '(error "Unknown response from mastodon-auth--get-token!")
+    (condition-case error
+        (progn
+          (mastodon-auth--handle-token-response '(:herp "derp"))
+          nil)
+      (t error)))))
+
+(ert-deftest mastodon-auth--handle-token-response--failure ()
+  "Should throw an error when the response indicates an error."
+  (let ((error-message "The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client."))
+    (should
+     (equal
+      `(error ,(format "Mastodon-auth--access-token: invalid_grant: %s" error-message))
+      (condition-case error
+          (mastodon-auth--handle-token-response
+           `(:error "invalid_grant" :error_description ,error-message))
+        (t error))))))
+
+(ert-deftest mastodon-auth--generate-token--no-storing-credentials ()
   "Should make `mastdon-http--post' request to generate auth token."
   (with-mock
     (let ((mastodon-auth-source-file "")
@@ -19,7 +51,7 @@
                                  :unauthenticated))
       (mastodon-auth--generate-token))))
 
-(ert-deftest generate-token--storing-credentials ()
+(ert-deftest mastodon-auth--generate-token--storing-credentials ()
   "Should make `mastdon-http--post' request to generate auth token."
   (with-mock
     (let ((mastodon-auth-source-file "~/.authinfo")
@@ -41,26 +73,33 @@
 				 :unauthenticated))
       (mastodon-auth--generate-token))))
 
-(ert-deftest get-token ()
+(ert-deftest mastodon-auth--get-token ()
   "Should generate token and return JSON response."
   (with-temp-buffer
     (with-mock
       (mock (mastodon-auth--generate-token) => (progn
                                                  (insert "\n\n{\"access_token\":\"abcdefg\"}")
                                                  (current-buffer)))
-      (should (equal (mastodon-auth--get-token) '(:access_token "abcdefg"))))))
+      (should
+       (equal (mastodon-auth--get-token)
+              '(:access_token "abcdefg"))))))
 
-(ert-deftest access-token-found ()
+(ert-deftest mastodon-auth--access-token-found ()
   "Should return value in `mastodon-auth--token-alist' if found."
   (let ((mastodon-instance-url "https://instance.url")
         (mastodon-auth--token-alist '(("https://instance.url" . "foobar")) ))
-    (should (string= (mastodon-auth--access-token) "foobar"))))
+    (should
+     (string= (mastodon-auth--access-token) "foobar"))))
 
-(ert-deftest access-token-2 ()
+(ert-deftest mastodon-auth--access-token-not-found ()
   "Should set and return `mastodon-auth--token' if nil."
   (let ((mastodon-instance-url "https://instance.url")
-        (mastodon-auth--token nil))
+        (mastodon-auth--token-alist nil))
     (with-mock
       (mock (mastodon-auth--get-token) => '(:access_token "foobaz"))
-      (should (string= (mastodon-auth--access-token) "foobaz"))
-      (should (equal mastodon-auth--token-alist '(("https://instance.url" . "foobaz")))))))
+      (should
+       (string= (mastodon-auth--access-token)
+                "foobaz"))
+      (should
+       (equal mastodon-auth--token-alist
+              '(("https://instance.url" . "foobaz")))))))
diff --git a/test/mastodon-client-tests.el b/test/mastodon-client-tests.el
index 12d2350..b112729 100644
--- a/test/mastodon-client-tests.el
+++ b/test/mastodon-client-tests.el
@@ -1,6 +1,8 @@
+;;; mastodon-client-test.el --- Tests for mastodon-client.el  -*- lexical-binding: nil -*-
+
 (require 'el-mock)
 
-(ert-deftest register ()
+(ert-deftest mastodon-client--register ()
   "Should POST to /apps."
   (with-mock
     (mock (mastodon-http--api "apps") => "https://instance.url/api/v1/apps")
@@ -13,7 +15,7 @@
                                :unauthenticated))
     (mastodon-client--register)))
 
-(ert-deftest fetch ()
+(ert-deftest mastodon-client--fetch ()
   "Should return client registration JSON."
   (with-temp-buffer
     (with-mock
@@ -22,7 +24,7 @@
                                              (current-buffer)))
       (should (equal (mastodon-client--fetch) '(:foo "bar"))))))
 
-(ert-deftest store-1 ()
+(ert-deftest mastodon-client--store-1 ()
   "Should return the client plist."
   (let ((mastodon-instance-url "http://mastodon.example")
         (plist '(:client_id "id" :client_secret "secret")))
@@ -33,8 +35,8 @@
              (client (cdr (plstore-get plstore "mastodon-http://mastodon.example"))))
         (should (equal (mastodon-client--store) plist))))))
 
-(ert-deftest store-2 ()
-  "Should store client in `mastodon-client--token-file'."
+(ert-deftest mastodon-client--store-2 ()
+ "Should store client in `mastodon-client--token-file'."
   (let* ((mastodon-instance-url "http://mastodon.example")
          (plstore (plstore-open "stubfile.plstore"))
          (client (cdr (plstore-get plstore "mastodon-http://mastodon.example"))))
@@ -42,7 +44,7 @@
     (should (string= (plist-get client :client_id) "id"))
     (should (string= (plist-get client :client_secret) "secret"))))
 
-(ert-deftest read-finds-match ()
+(ert-deftest mastodon-client--read-finds-match ()
   "Should return mastodon client from `mastodon-token-file' if it exists."
   (let ((mastodon-instance-url "http://mastodon.example"))
     (with-mock
@@ -50,27 +52,27 @@
       (should (equal (mastodon-client--read)
                      '(:client_id "id2" :client_secret "secret2"))))))
 
-(ert-deftest read-finds-no-match ()
+(ert-deftest mastodon-client--read-finds-no-match ()
   "Should return mastodon client from `mastodon-token-file' if it exists."
   (let ((mastodon-instance-url "http://mastodon.social"))
     (with-mock
       (mock (mastodon-client--token-file) => "fixture/client.plstore")
       (should (equal (mastodon-client--read) nil)))))
 
-(ert-deftest read-empty-store ()
+(ert-deftest mastodon-client--read-empty-store ()
   "Should return nil if mastodon client is not present in the plstore."
   (with-mock
     (mock (mastodon-client--token-file) => "fixture/empty.plstore")
     (should (equal (mastodon-client--read) nil))))
 
-(ert-deftest client-set-and-matching ()
+(ert-deftest mastodon-client--client-set-and-matching ()
   "Should return `mastondon-client' if `mastodon-client--client-details-alist' is non-nil and instance url is included."
   (let ((mastodon-instance-url "http://mastodon.example")
         (mastodon-client--client-details-alist '(("https://other.example" . :no-match)
                                                  ("http://mastodon.example" . :matches))))
     (should (eq (mastodon-client) :matches))))
 
-(ert-deftest client-set-but-not-matching ()
+(ert-deftest mastodon-client--client-set-but-not-matching ()
   "Should read from `mastodon-token-file' if wrong data is cached."
   (let ((mastodon-instance-url "http://mastodon.example")
         (mastodon-client--client-details-alist '(("http://other.example" :wrong))))
@@ -81,7 +83,7 @@
                      '(("http://mastodon.example" :client_id "foo" :client_secret "bar")
                        ("http://other.example" :wrong)))))))
 
-(ert-deftest client-unset ()
+(ert-deftest mastodon-client--client-unset ()
   "Should read from `mastodon-token-file' if available."
   (let ((mastodon-instance-url "http://mastodon.example")
         (mastodon-client--client-details-alist nil))
@@ -91,7 +93,7 @@
       (should (equal mastodon-client--client-details-alist
                      '(("http://mastodon.example" :client_id "foo" :client_secret "bar")))))))
 
-(ert-deftest client-unset-and-not-in-storage ()
+(ert-deftest mastodon-client--client-unset-and-not-in-storage ()
   "Should store client data in plstore if it can't be read."
   (let ((mastodon-instance-url "http://mastodon.example")
         (mastodon-client--client-details-alist nil))
diff --git a/test/mastodon-http-tests.el b/test/mastodon-http-tests.el
index d0f715e..00e1f41 100644
--- a/test/mastodon-http-tests.el
+++ b/test/mastodon-http-tests.el
@@ -1,9 +1,10 @@
+;;; mastodon-http-test.el --- Tests for mastodon-http.el  -*- lexical-binding: nil -*-
+
 (require 'el-mock)
 
-(ert-deftest mastodon-http:get:retrieves-endpoint ()
+(ert-deftest mastodon-http--get-retrieves-endpoint ()
   "Should make a `url-retrieve' of the given URL."
-  (let ((callback-double (lambda () "double")))
-    (with-mock
-      (mock (mastodon-http--url-retrieve-synchronously "https://foo.bar/baz"))
-      (mock (mastodon-auth--access-token) => "test-token")
-      (mastodon-http--get "https://foo.bar/baz"))))
+  (with-mock
+    (mock (mastodon-http--url-retrieve-synchronously "https://foo.bar/baz"))
+    (mock (mastodon-auth--access-token) => "test-token")
+    (mastodon-http--get "https://foo.bar/baz")))
diff --git a/test/mastodon-media-tests.el b/test/mastodon-media-tests.el
index 3345e74..886c7b0 100644
--- a/test/mastodon-media-tests.el
+++ b/test/mastodon-media-tests.el
@@ -1,6 +1,8 @@
+;;; mastodon-media-test.el --- Tests for mastodon-media.el  -*- lexical-binding: nil -*-
+
 (require 'el-mock)
 
-(ert-deftest mastodon-media:get-avatar-rendering ()
+(ert-deftest mastodon-media--get-avatar-rendering ()
   "Should return text with all expected properties."
   (with-mock
     (mock (image-type-available-p 'imagemagick) => t)
@@ -16,7 +18,7 @@
       (should (eq 'avatar (plist-get properties 'media-type)))
       (should (eq :mock-image (plist-get properties 'display))))))
 
-(ert-deftest mastodon-media:get-media-link-rendering ()
+(ert-deftest mastodon-media--get-media-link-rendering ()
   "Should return text with all expected properties."
   (with-mock
     (mock (create-image * nil t) => :mock-image)
@@ -39,7 +41,7 @@
       (should (string= "RET/i: load full image (prefix: copy URL), +/-: zoom, r: rotate, o: save preview"
                        (plist-get properties 'help-echo))))))
 
-(ert-deftest mastodon-media:load-image-from-url:avatar-with-imagemagic ()
+(ert-deftest mastodon-media--load-image-from-url-avatar-with-imagemagic ()
   "Should make the right call to url-retrieve."
   (let ((url "http://example.org/image.png")
         (mastodon-media--avatar-height 123))
@@ -63,7 +65,7 @@
 
         (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'avatar 7 1)))))))
 
-(ert-deftest mastodon-media:load-image-from-url:avatar-without-imagemagic ()
+(ert-deftest mastodon-media--load-image-from-url-avatar-without-imagemagic ()
   "Should make the right call to url-retrieve."
   (let ((url "http://example.org/image.png"))
     (with-mock
@@ -83,7 +85,7 @@
 
         (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'avatar 7 1)))))))
 
-(ert-deftest mastodon-media:load-image-from-url:media-link-with-imagemagic ()
+(ert-deftest mastodon-media--load-image-from-url-media-link-with-imagemagic ()
   "Should make the right call to url-retrieve."
   (let ((url "http://example.org/image.png"))
     (with-mock
@@ -102,7 +104,7 @@
         (let ((mastodon-media--preview-max-height 321))
           (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'media-link 7 5))))))))
 
-(ert-deftest mastodon-media:load-image-from-url:media-link-without-imagemagic ()
+(ert-deftest mastodon-media--load-image-from-url-media-link-without-imagemagic ()
   "Should make the right call to url-retrieve."
   (let ((url "http://example.org/image.png"))
     (with-mock
@@ -122,7 +124,7 @@
         (let ((mastodon-media--preview-max-height 321))
           (should (eq :called-as-expected (mastodon-media--load-image-from-url url 'media-link 7 5))))))))
 
-(ert-deftest mastodon-media:load-image-from-url:url-fetching-fails ()
+(ert-deftest mastodon-media--load-image-from-url-url-fetching-fails ()
   "Should cope with failures in url-retrieve."
   (let ((url "http://example.org/image.png")
         (mastodon-media--avatar-height 123))
@@ -143,7 +145,7 @@
         ;; the media state was updated so we won't load this again: 
         (should (eq 'loading-failed (get-text-property 7 'media-state)))))))
 
-(ert-deftest mastodon-media:process-image-response ()
+(ert-deftest mastodon-media--process-image-response ()
   "Should process the HTTP response and adjust the source buffer."
   (with-temp-buffer
     (with-mock
@@ -180,7 +182,7 @@
           (should (eq 'loaded (get-text-property saved-marker 'media-state source-buffer)))
           (should (eq ':fake-image (get-text-property saved-marker 'display source-buffer))))))))
 
-(ert-deftest mastodon-media:inline-images ()
+(ert-deftest mastodon-media--inline-images ()
   "Should process all media in buffer."
   (with-mock
     ;; Stub needed for the test setup:
diff --git a/test/mastodon-notifications-test.el b/test/mastodon-notifications-test.el
index 778d350..ee6748a 100644
--- a/test/mastodon-notifications-test.el
+++ b/test/mastodon-notifications-test.el
@@ -1,8 +1,10 @@
+;;; mastodon-notifications-test.el --- Tests for mastodon-notifications.el  -*- lexical-binding: nil -*-
+
 (require 'cl-lib)
 (require 'cl-macs)
 (require 'el-mock)
 
-(defconst mastodon-notifications-test-base-mentioned
+(defconst mastodon-notifications--test-base-mentioned
   '((id . "1234")
     (type . "mention")
     (created_at . "2018-03-06T04:27:21.288Z" )
@@ -43,7 +45,7 @@
             (favourites_count . 0)
             (reblog))))
 
-(defconst mastodon-notifications-test-base-favourite
+(defconst mastodon-notifications--test-base-favourite
   '((id . "1234")
     (type . "favourite")
     (created_at . "2018-03-06T04:27:21.288Z" )
@@ -84,7 +86,7 @@
             (favourites_count . 0)
             (reblog))))
 
-(defconst mastodon-notifications-test-base-boosted
+(defconst mastodon-notifications--test-base-boosted
   '((id . "1234")
     (type . "reblog")
     (created_at . "2018-03-06T04:27:21.288Z" )
@@ -125,7 +127,7 @@
             (favourites_count . 0)
             (reblog))))
 
-(defconst mastodon-notifications-test-base-followed
+(defconst mastodon-notifications--test-base-followed
   '((id . "1234")
     (type . "follow")
     (created_at . "2018-03-06T04:27:21.288Z" )
@@ -166,7 +168,7 @@
             (favourites_count . 0)
             (reblog))))
 
-(defconst mastodon-notifications-test-base-favourite
+(defconst mastodon-notifications--test-base-favourite
   '((id . "1234")
     (type . "mention")
     (created_at . "2018-03-06T04:27:21.288Z" )
@@ -181,7 +183,7 @@
              (statuses_count . 101)
              (note . "E"))))
 
-(ert-deftest notification-get ()
+(ert-deftest mastodon-notifications--notification-get ()
   "Ensure get request format for notifictions is accurate."
   (let ((mastodon-instance-url "https://instance.url"))
     (with-mock
diff --git a/test/mastodon-search-tests.el b/test/mastodon-search-tests.el
index 552f467..996f786 100644
--- a/test/mastodon-search-tests.el
+++ b/test/mastodon-search-tests.el
@@ -1,4 +1,4 @@
-
+;;; mastodon-search-test.el --- Tests for mastodon-search.el  -*- lexical-binding: nil -*-
 
 (defconst mastodon-search--single-account-query
   '((id . "242971")
@@ -37,7 +37,7 @@
               (verified_at))]))
   "A sample mastodon account search result (parsed json)")
 
-(defconst mastodon-search-test-single-tag
+(defconst mastodon-search--test-single-tag
   '((name . "TeamBringBackVisibleScrollbars")
     (url . "https://todon.nl/tags/TeamBringBackVisibleScrollbars")
     (history . [((day . "1636156800") (uses . "0") (accounts . "0"))
@@ -48,7 +48,7 @@
                 ((day . "1635724800") (uses . "0") (accounts . "0"))
                 ((day . "1635638400") (uses . "0") (accounts . "0"))])))
 
-(defconst mastodon-search-test-single-status
+(defconst mastodon-search--test-single-status
   '((id . "107230316503209282")
     (created_at . "2021-11-06T13:19:40.628Z")
     (in_reply_to_id)
@@ -114,33 +114,33 @@
     (card)
     (poll)))
 
-(ert-deftest mastodon-search-test-get-user-info-@ ()
+(ert-deftest mastodon-search--get-user-info-@ ()
   "Should build a list from a single account for company completion."
   (should
    (equal
     (mastodon-search--get-user-info-@ mastodon-search--single-account-query)
     '(": ( ) { : | : & } ; :" "@mousebot" "https://todon.nl/@mousebot"))))
 
-(ert-deftest mastodon-search-test-get-user-info ()
+(ert-deftest mastodon-search--get-user-info ()
   "Should build a list from a single account for company completion."
   (should
    (equal
     (mastodon-search--get-user-info mastodon-search--single-account-query)
     '(": ( ) { : | : & } ; :" "mousebot" "https://todon.nl/@mousebot"))))
 
-(ert-deftest mastodon-search-test-get-hashtag-info ()
+(ert-deftest mastodon-search--get-hashtag-info ()
   "Should build a list of hashtag name and URL."
   (should
    (equal
-    (mastodon-search--get-hashtag-info mastodon-search-test-single-tag)
+    (mastodon-search--get-hashtag-info mastodon-search--test-single-tag)
     '("TeamBringBackVisibleScrollbars"
       "https://todon.nl/tags/TeamBringBackVisibleScrollbars"))))
 
-(ert-deftest mastodon-search-test-get-status-info ()
+(ert-deftest mastodon-search--get-status-info ()
   "Should return a list of ID, timestamp, content, and spoiler."
   (should
    (equal
-    (mastodon-search--get-status-info mastodon-search-test-single-status)
+    (mastodon-search--get-status-info mastodon-search--test-single-status)
     '("107230316503209282"
       "2021-11-06T13:19:40.628Z"
       ""
diff --git a/test/mastodon-tl-tests.el b/test/mastodon-tl-tests.el
index e4606cc..da3b315 100644
--- a/test/mastodon-tl-tests.el
+++ b/test/mastodon-tl-tests.el
@@ -1,3 +1,5 @@
+;;; mastodon-tl-test.el --- Tests for mastodon-tl.el  -*- lexical-binding: nil -*-
+
 (require 'cl-lib)
 (require 'cl-macs)
 (require 'el-mock)
@@ -89,46 +91,46 @@
             (reblogged)))
   "A sample reblogged/boosted toot (parsed json)")
 
-(ert-deftest remove-html-1 ()
+(ert-deftest mastodon-tl--remove-html-1 ()
   "Should remove all <span> tags."
   (let ((input "<span class=\"h-card\">foobar</span> <span>foobaz</span>"))
     (should (string= (mastodon-tl--remove-html input) "foobar foobaz"))))
 
-(ert-deftest remove-html-2 ()
+(ert-deftest mastodon-tl--remove-html-2 ()
   "Should replace <\p> tags with two new lines."
   (let ((input "foobar</p>"))
     (should (string= (mastodon-tl--remove-html input) "foobar\n\n"))))
 
-(ert-deftest toot-id-boosted ()
+(ert-deftest mastodon-tl--toot-id-boosted ()
   "If a toot is boostedm, return the reblog id."
   (should (string= (mastodon-tl--as-string
                     (mastodon-tl--toot-id mastodon-tl-test-base-boosted-toot))
                    "4543919")))
 
-(ert-deftest toot-id ()
+(ert-deftest mastodon-tl--toot-id ()
   "If a toot is boostedm, return the reblog id."
   (should (string= (mastodon-tl--as-string
                     (mastodon-tl--toot-id mastodon-tl-test-base-toot))
                    "61208")))
 
-(ert-deftest as-string-1 ()
+(ert-deftest mastodon-tl--as-string-1 ()
   "Should accept a string or number and return a string."
   (let ((id "1000"))
     (should (string= (mastodon-tl--as-string id) id))))
 
-(ert-deftest as-string-2 ()
+(ert-deftest mastodon-tl--as-string-2 ()
   "Should accept a string or number and return a string."
   (let ((id 1000))
     (should (string= (mastodon-tl--as-string id) (number-to-string id)))))
 
-(ert-deftest more-json ()
+(ert-deftest mastodon-tl--more-json ()
   "Should request toots older than max_id."
   (let ((mastodon-instance-url "https://instance.url"))
     (with-mock
       (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?max_id=12345"))
       (mastodon-tl--more-json "timelines/foo" 12345))))
 
-(ert-deftest more-json-id-string ()
+(ert-deftest mastodon-tl--more-json-id-string ()
   "Should request toots older than max_id.
 
 `mastodon-tl--more-json' should accept and id that is either
@@ -138,7 +140,7 @@ a string or a numeric."
       (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo?max_id=12345"))
       (mastodon-tl--more-json "timelines/foo" "12345"))))
 
-(ert-deftest update-json-id-string ()
+(ert-deftest mastodon-tl--update-json-id-string ()
   "Should request toots more recent than since_id.
 
 `mastodon-tl--updated-json' should accept and id that is either
@@ -912,23 +914,27 @@ constant."
                    "Browse tag #sampletag"))))
 
 (ert-deftest mastodon-tl--extract-hashtag-from-url-mastodon-link ()
+  "Should extract the hashtag from a tags url."
   (should (equal (mastodon-tl--extract-hashtag-from-url
 		  "https://example.org/tags/foo"
 		  "https://example.org")
 		 "foo")))
 
 (ert-deftest mastodon-tl--extract-hashtag-from-url-other-link ()
+  "Should extract the hashtag from a tag url."
   (should (equal (mastodon-tl--extract-hashtag-from-url
 		  "https://example.org/tag/foo"
 		  "https://example.org")
 		 "foo")))
 
 (ert-deftest mastodon-tl--extract-hashtag-from-url-wrong-instance ()
+  "Should not find a tag when the instance doesn't match."
   (should (null (mastodon-tl--extract-hashtag-from-url
 		 "https://example.org/tags/foo"
 		 "https://other.example.org"))))
 
 (ert-deftest mastodon-tl--extract-hashtag-from-url-not-tag ()
+  "Should not find a hashtag when not a tag url"
   (should (null (mastodon-tl--extract-hashtag-from-url
 		 "https://example.org/@userid"
 		 "https://example.org"))))
@@ -957,17 +963,20 @@ constant."
                    "Browse user profile of @foo@bar.example"))))
 
 (ert-deftest mastodon-tl--extract-userhandle-from-url-correct-case ()
+  "Should extract the user handle from url."
   (should (equal (mastodon-tl--extract-userhandle-from-url
                   "https://example.org/@someuser"
                   "@SomeUser")
                  "@SomeUser@example.org")))
 
 (ert-deftest mastodon-tl--extract-userhandle-from-url-missing-at-in-text ()
+  "Should not extract a user handle from url if the text is wrong."
   (should (null (mastodon-tl--extract-userhandle-from-url
                  "https://example.org/@someuser"
                  "SomeUser"))))
 
 (ert-deftest mastodon-tl--extract-userhandle-from-url-query-in-url ()
+  "Should not extract a user handle from url if there is a query param."
   (should (null (mastodon-tl--extract-userhandle-from-url
                  "https://example.org/@someuser?shouldnot=behere"
                  "SomeUser"))))
diff --git a/test/mastodon-toot-tests.el b/test/mastodon-toot-tests.el
index 06da870..804c55a 100644
--- a/test/mastodon-toot-tests.el
+++ b/test/mastodon-toot-tests.el
@@ -1,6 +1,8 @@
+;;; mastodon-toot-test.el --- Tests for mastodon-toot.el  -*- lexical-binding: nil -*-
+
 (require 'el-mock)
 
-(defconst mastodon-toot-multi-mention
+(defconst mastodon-toot--multi-mention
   '((mentions .
               [((id . "1")
                 (username . "federated")
@@ -18,28 +20,37 @@
 (defconst mastodon-toot-no-mention
   '((mentions . [])))
 
-(ert-deftest toot-multi-mentions ()
+(ert-deftest mastodon-toot--multi-mentions ()
+  "Should build a correct mention string from the test toot data.
+
+Even the local name \"local\" gets a domain name added."
   (let ((mastodon-auth--acct-alist '(("https://local.social". "null")))
         (mastodon-instance-url "https://local.social"))
     (should (string=
-             (mastodon-toot--mentions mastodon-toot-multi-mention)
+             (mastodon-toot--mentions mastodon-toot--multi-mention)
              "@local@local.social @federated@federated.social @federated@federated.cafe "))))
 
-(ert-deftest toot-multi-mentions-with-name ()
+(ert-deftest mastodon-toot--multi-mentions-with-name ()
+  "Should build a correct mention string omitting self.
+
+Here \"local\" is the user themselves and gets omitted from the
+mention string."
   (let ((mastodon-auth--acct-alist
          '(("https://local.social". "local")))
         (mastodon-instance-url "https://local.social"))
     (should (string=
-             (mastodon-toot--mentions mastodon-toot-multi-mention)
+             (mastodon-toot--mentions mastodon-toot--multi-mention)
              "@federated@federated.social @federated@federated.cafe "))))
 
-(ert-deftest toot-no-mention ()
+(ert-deftest mastodon-toot--no-mention ()
+  "Should construct an empty mention string without mentions."
   (let ((mastodon-auth--acct-alist
          '(("https://local.social". "null")))
         (mastodon-instance-url "https://local.social"))
     (should (string= (mastodon-toot--mentions mastodon-toot-no-mention) ""))))
 
-(ert-deftest cancel ()
+(ert-deftest mastodon-toot--cancel ()
+  "Should kill the buffer when cancelling the toot."
   (with-mock
     (mock (kill-buffer-and-window))
     (mastodon-toot--cancel)
-- 
cgit v1.2.3


From eb922191259721d6b1b232de41bbd43ebdb10d2f Mon Sep 17 00:00:00 2001
From: Holger Dürer <me@hdurer.net>
Date: Tue, 9 Nov 2021 21:06:04 +0100
Subject: Make the local ert runner pass.

When just loading the lisp and test files one can run `M-x ert` but
because things are subtly different we need to tweak a few more things
to make things pass in that mode.
---
 test/fixture                  | 1 +
 test/mastodon-client-tests.el | 2 +-
 test/mastodon-media-tests.el  | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 120000 test/fixture

(limited to 'test')

diff --git a/test/fixture b/test/fixture
new file mode 120000
index 0000000..f418013
--- /dev/null
+++ b/test/fixture
@@ -0,0 +1 @@
+../fixture
\ No newline at end of file
diff --git a/test/mastodon-client-tests.el b/test/mastodon-client-tests.el
index b112729..9123286 100644
--- a/test/mastodon-client-tests.el
+++ b/test/mastodon-client-tests.el
@@ -36,7 +36,7 @@
         (should (equal (mastodon-client--store) plist))))))
 
 (ert-deftest mastodon-client--store-2 ()
- "Should store client in `mastodon-client--token-file'."
+  "Should store client in `mastodon-client--token-file'."
   (let* ((mastodon-instance-url "http://mastodon.example")
          (plstore (plstore-open "stubfile.plstore"))
          (client (cdr (plstore-get plstore "mastodon-http://mastodon.example"))))
diff --git a/test/mastodon-media-tests.el b/test/mastodon-media-tests.el
index 886c7b0..6168aaf 100644
--- a/test/mastodon-media-tests.el
+++ b/test/mastodon-media-tests.el
@@ -70,6 +70,7 @@
   (let ((url "http://example.org/image.png"))
     (with-mock
       (mock (image-type-available-p 'imagemagick) => nil)
+      (mock (image-transforms-p) => nil)
       (mock (create-image * nil t) => '(image foo))
       (mock (copy-marker 7) => :my-marker )
       (mock (url-retrieve
@@ -109,6 +110,7 @@
   (let ((url "http://example.org/image.png"))
     (with-mock
       (mock (image-type-available-p 'imagemagick) => nil)
+      (mock (image-transforms-p) => nil)
       (mock (create-image * nil t) => '(image foo))
       (mock (copy-marker 7) => :my-marker )
       (mock (url-retrieve
-- 
cgit v1.2.3