Merge pull request #173 from jdenen/develop

Merge 0.7.2 into master

4 files changed, 685 insertions, 30 deletions

diff --git a/test/mastodon-auth-tests.el b/test/mastodon-auth-tests.el
index 70c63d8..719a56c 100644
--- a/test/mastodon-auth-tests.el
+++ b/test/mastodon-auth-tests.el
@@ -14,7 +14,8 @@
                                     ("username" . "foo@bar.com")
                                     ("password" . "password")
                                     ("scope" . "read write follow"))
-                                 nil))
+                                 nil
+                                 :unauthenticated))
       (mastodon-auth--generate-token))))
 
 (ert-deftest get-token ()
@@ -26,15 +27,17 @@
                                                   (current-buffer)))
       (should (equal (mastodon-auth--get-token) '(:access_token "abcdefg"))))))
 
-(ert-deftest access-token-1 ()
-  "Should return `mastodon-auth--token' if non-nil."
-  (let ((mastodon-auth--token "foobar"))
+(ert-deftest 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"))))
 
 (ert-deftest access-token-2 ()
   "Should set and return `mastodon-auth--token' if nil."
-  (let ((mastodon-auth--token nil))
+  (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 (string= mastodon-auth--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 c339efa..dfe175b 100644
--- a/test/mastodon-client-tests.el
+++ b/test/mastodon-client-tests.el
@@ -9,7 +9,8 @@
                                 ("redirect_uris" . "urn:ietf:wg:oauth:2.0:oob")
                                 ("scopes" . "read write follow")
                                 ("website" . "https://github.com/jdenen/mastodon.el"))
-                              nil))
+                              nil
+                              :unauthenticated))
    (mastodon-client--register)))
 
 (ert-deftest fetch ()
@@ -23,53 +24,80 @@
 
 (ert-deftest store-1 ()
   "Should return the client plist."
-  (let ((plist '(:client_id "id" :client_secret "secret")))
+  (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 (delete "mastodon" (plstore-get plstore "mastodon"))))
-        (should (equal (mastodon-client--store) plist))
-        ))))
+             (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* ((plstore (plstore-open "stubfile.plstore"))
-          (client (delete "mastodon" (plstore-get plstore "mastodon"))))
+   (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-1 ()
+(ert-deftest read-finds-match ()
   "Should return mastodon client from `mastodon-token-file' if it exists."
-  (with-mock
-    (mock (mastodon-client--token-file) => "fixture/client.plstore")
-    (should (equal (mastodon-client--read) '(:client_id "id" :client_secret "secret")))))
+  (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"))))))
+
+(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)))))
 
-(ert-deftest read-2 ()
+(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))))
 
-(ert-deftest client-1 ()
-  "Should return `mastondon-client' if non-nil."
-  (let ((mastodon-client--client-details t))
-    (should (eq (mastodon-client) t))))
+(ert-deftest 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 ()
+  "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))))
+    (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)))))))
 
-(ert-deftest client-2 ()
+(ert-deftest client-unset ()
   "Should read from `mastodon-token-file' if available."
-  (let ((mastodon-client--client-details nil))
+  (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 '(: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-3 ()
+(ert-deftest client-unset-and-not-in-storage ()
   "Should store client data in plstore if it can't be read."
-  (let ((mastodon-client--client-details nil))
+  (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 '(: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-tl-tests.el b/test/mastodon-tl-tests.el
index 8c706f5..189916d 100644
--- a/test/mastodon-tl-tests.el
+++ b/test/mastodon-tl-tests.el
@@ -1,3 +1,5 @@
+(require 'cl-lib)
+(require 'cl-macs)
 (require 'el-mock)
 
 (defconst mastodon-tl-test-base-toot
@@ -6,7 +8,7 @@
     (in_reply_to_id)
     (in_reply_to_account_id)
     (sensitive . :json-false)
-    (spoiler_text . "Spoiler text")
+    (spoiler_text . "")
     (visibility . "public")
     (account (id . 42)
              (username . "acct42")
@@ -23,6 +25,7 @@
     (tags . [])
     (uri . "tag:example.space,2017-04-24:objectId=654321:objectType=Status")
     (url . "https://example.space/users/acct42/updates/123456789")
+    (content . "<p>Just some text</p>")
     (reblogs_count . 0)
     (favourites_count . 0)
     (reblog))
@@ -34,7 +37,7 @@
     (in_reply_to_id)
     (in_reply_to_account_id)
     (sensitive . :json-false)
-    (spoiler_text . "Spoiler text")
+    (spoiler_text . "")
     (visibility . "public")
     (account (id . 42)
              (username . "acct42")
@@ -96,6 +99,28 @@
   (let ((input "foobar</p>"))
     (should (string= (mastodon-tl--remove-html input) "foobar\n\n"))))
 
+(ert-deftest 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 ()
+  "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 ()
+  "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 ()
+  "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 ()
   "Should request toots older than max_id."
   (let ((mastodon-instance-url "https://instance.url"))
@@ -103,6 +128,126 @@
       (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.
+
+`mastodon-tl--more-json' should accept and id that is either
+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"))))
+
+(ert-deftest update-json-id-string ()
+  "Should request toots more recent than since_id.
+
+`mastodon-tl--updated-json' should accept and id that is either
+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"))))
+
+(ert-deftest mastodon-tl--relative-time-description ()
+  "Should format relative time as expected"
+  (cl-labels ((minutes (n) (* n 60))
+              (hours (n) (* n (minutes 60)))
+              (days (n) (* n (hours 24)))
+              (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)))
+              (check (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")
+    (check 89 "one minute ago")            ;; rounding down
+    (check 91 "2 minutes ago")             ;; rounding up
+    (check (minutes 3.49) "3 minutes ago") ;; rounding down
+    (check (minutes 3.52) "4 minutes ago")
+    (check (minutes 59) "59 minutes ago")
+    (check (minutes 60) "one hour ago")
+    (check (minutes 89) "one hour ago")
+    (check (minutes 91) "2 hours ago")
+    (check (hours 3.49) "3 hours ago") ;; rounding down
+    (check (hours 3.51) "4 hours ago") ;; rounding down
+    (check (hours 23.4) "23 hours ago")
+    (check (hours 23.6) "one day ago") ;; rounding up
+    (check (days 1.48) "one day ago")  ;; rounding down
+    (check (days 1.52) "2 days ago")   ;; rounding up
+    (check (days 6.6) "one week ago")  ;; rounding up
+    (check (weeks 2.49) "2 weeks ago") ;; rounding down
+    (check (weeks 2.51) "3 weeks ago") ;; rounding down
+    (check (1- (weeks 52)) "52 weeks ago")
+    (check (weeks 52) "one year ago")
+    (check (years 2.49) "2 years ago") ;; rounding down
+    (check (years 2.51) "3 years ago") ;; rounding down
+    ))
+
+(ert-deftest mastodon-tl--relative-time-details--next-update ()
+  "Should calculate the next update time information as expected"
+  (let ((current-time (current-time)))
+    (cl-labels ((minutes (n) (* n 60))
+                (hours (n) (* n (minutes 60)))
+                (days (n) (* n (hours 24)))
+                (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))))
+                (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)))))
+      (check 0)
+      (check 1)
+      (check 59)
+      (check 60)
+      (check 89)
+      (check 90)
+      (check 149)
+      (check 150)
+      (check (1- (hours 1.5))) ;; just before we switch from "one hour" to "2 hours"
+      (check (hours 1.5))
+      (check (hours 2.1))
+      (check (1- (hours 23.5))) ;; just before "23 hours" -> "one day"
+      (check (hours 23.5))
+      (check (1- (days 1.5))) ;; just before "one day" -> "2 days"
+      (check (days 1.5)) ;; just before "one day" -> "2 days"
+      (check (days 2.1))
+      (check (1- (days 6.5))) ;; just before "6 days" -> "one week"
+      (check (days 6.5)) ;; "one week" -> "2 weeks"
+      (check (weeks 2.1))
+      (check (1- (weeks 52))) ;; just before "52 weeks" -> "one year"
+      (check (weeks 52))
+      (check (days 365))
+      (check (days 366))
+      (check (years 2.1))
+      )))
+
 (ert-deftest mastodon-tl--byline-regular ()
   "Should format the regular toot correctly."
   (let ((mastodon-tl--show-avatars-p nil)
@@ -236,3 +381,443 @@
  | (B) (F) Account 42 (@acct42@example.space) Boosted Account 43 (@acct43@example.space) original time
   ------------")))))
 
+(ert-deftest mastodon-tl--byline-timestamp-has-relative-display ()
+  "Should display the timestamp with a relative time."
+  (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))
+             (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."
+
+  (let* ((now (current-time))
+         (soon-in-the-future (time-add now (seconds-to-time 10000)))
+         (long-in-the-future (time-add now (seconds-to-time 10000000))))
+    (with-temp-buffer
+      ;; start with timer way into the future and no active callback
+      (setq mastodon-tl--timestamp-next-update long-in-the-future
+            mastodon-tl--timestamp-update-timer nil)
+
+      ;; 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))))
+
+        (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)))
+
+      ;; 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))))
+
+        (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)))
+
+      ;; something much sooner, does update
+      (with-mock
+        (mock (mastodon-tl--relative-time-details 'fake-timestamp) =>
+              (cons "xxx ago"  soon-in-the-future))
+
+        (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)))
+      )))
+
+(ert-deftest mastodon-tl--consider-timestamp-for-updates-with-active-callback ()
+  "Should update the timestamp update variables as expected."
+
+  (let* ((now (current-time))
+         (soon-in-the-future (time-add now (seconds-to-time 10000)))
+         (long-in-the-future (time-add now (seconds-to-time 10000000))))
+    (with-temp-buffer
+      ;; start with timer way into the future and no active callback
+      (setq mastodon-tl--timestamp-next-update long-in-the-future
+            mastodon-tl--timestamp-update-timer 'initial-timer)
+
+      ;; 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))))
+
+        (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)))
+
+      ;; 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)
+
+        (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)))
+      )))
+
+(ert-deftest mastodon-tl--find-property-range--no-tag ()
+  "Should cope with a buffer completely lacking the tag."
+  (with-temp-buffer
+    (insert "Just some random text")
+    (insert (propertize "More text with a different property" 'other-property 'set))
+
+    (should (null (mastodon-tl--find-property-range 'test-property 2 nil)))
+    (should (null (mastodon-tl--find-property-range 'test-property 2 t)))))
+
+(ert-deftest mastodon-tl--find-property-range--earlier-tag ()
+  "Should cope with a buffer completely lacking the tag."
+  (with-temp-buffer
+    (insert (propertize "Just some text with a the sought property" 'test-property 'set))
+    (let ((end-of-region (point)))
+      (insert "More random text")
+
+      (should (null (mastodon-tl--find-property-range 'test-property end-of-region nil)))
+      (should (equal (cons (point-min) end-of-region)
+                     (mastodon-tl--find-property-range 'test-property end-of-region t))))))
+
+(ert-deftest mastodon-tl--find-property-range--successful-finding ()
+  "Should find the sought tag in all expected circumstances."
+  (with-temp-buffer
+    (insert "Previous text")
+    (let ((start-of-region (point))
+          end-of-region)
+      (insert (propertize "Just some text with a the sought property" 'test-property 'set))
+      (setq end-of-region (point))
+      (insert "More random text")
+
+      ;; before the region
+      (should (equal (cons start-of-region end-of-region)
+                     (mastodon-tl--find-property-range 'test-property 1 nil)))
+      (should (null (mastodon-tl--find-property-range 'test-property 1 t)))
+      ;; in the region
+      (should (equal (cons start-of-region end-of-region)
+                     (mastodon-tl--find-property-range 'test-property (+ 2 start-of-region) nil)))
+      (should (equal (cons start-of-region end-of-region)
+                     (mastodon-tl--find-property-range 'test-property (+ 2 start-of-region) t)))
+      ;; at end of region
+      (should (equal (cons start-of-region end-of-region)
+                     (mastodon-tl--find-property-range 'test-property (1- end-of-region) nil)))
+      (should (equal (cons start-of-region end-of-region)
+                     (mastodon-tl--find-property-range 'test-property (1- end-of-region) t))))))
+
+(ert-deftest mastodon-tl--find-property-range--successful-finding-consecutive-ranges ()
+  "Should find the sought tag even from in between consecutive ranges."
+  (with-temp-buffer
+    (insert "Previous text")
+    (let ((start-of-region-1 (point))
+          between-regions
+          end-of-region-2)
+      (insert (propertize "region1" 'test-property 'region1))
+      (setq between-regions (point))
+      (insert (propertize "region2" 'test-property 'region2))
+      (setq end-of-region-2 (point))
+      (insert "More random text")
+
+
+      ;; before
+      (should (equal (cons start-of-region-1 between-regions)
+                     (mastodon-tl--find-property-range 'test-property 1 nil)))
+      (should (null (mastodon-tl--find-property-range 'test-property 1 t)))
+
+      ;; between the regions
+      (should (equal (cons between-regions end-of-region-2)
+                     (mastodon-tl--find-property-range 'test-property between-regions nil)))
+      (should (equal (cons between-regions end-of-region-2)
+                     (mastodon-tl--find-property-range 'test-property between-regions t)))
+      ;; after
+      (should (null (mastodon-tl--find-property-range 'test-property end-of-region-2 nil)))
+      (should (equal (cons between-regions end-of-region-2)
+                     (mastodon-tl--find-property-range 'test-property end-of-region-2 t))))))
+
+(ert-deftest mastodon-tl--find-property-range--successful-finding-at-start ()
+  "Should cope with a tag at start."
+  (with-temp-buffer
+    (insert (propertize "Just some text with a the sought property" 'test-property 'set))
+    (let ((end-of-region (point)))
+      (insert "More random text")
+
+      ;; at start of the region
+      (should (equal (cons 1 end-of-region)
+                     (mastodon-tl--find-property-range 'test-property 1 nil)))
+      (should (equal (cons 1 end-of-region)
+                     (mastodon-tl--find-property-range 'test-property 1 t)))
+      ;; in the region
+      (should (equal (cons 1 end-of-region)
+                     (mastodon-tl--find-property-range 'test-property 3 nil)))
+      (should (equal (cons 1 end-of-region)
+                     (mastodon-tl--find-property-range 'test-property 3 t)))
+      ;; at end of region
+      (should (equal (cons 1 end-of-region)
+                     (mastodon-tl--find-property-range 'test-property (1- end-of-region) t))))))
+
+(ert-deftest mastodon-tl--find-property-range--successful-finding-at-end ()
+  "Should cope with a tag at end."
+  (with-temp-buffer
+    (insert "More random text")
+    (let ((start-of-region (point))
+          end-of-region)
+      (insert (propertize "Just some text with a the sought property" 'test-property 'set))
+      (setq end-of-region (point-max))
+
+      ;; before the region
+      (should (equal (cons start-of-region end-of-region)
+                     (mastodon-tl--find-property-range 'test-property 1 nil)))
+      (should (null (mastodon-tl--find-property-range 'test-property 1 t)))
+      ;; in the region
+      (should (equal (cons start-of-region end-of-region)
+                     (mastodon-tl--find-property-range 'test-property (1+ start-of-region) nil)))
+      (should (equal (cons start-of-region end-of-region)
+                     (mastodon-tl--find-property-range 'test-property (1+ start-of-region) t)))
+      ;; at end of region
+      (should (equal (cons start-of-region end-of-region)
+                     (mastodon-tl--find-property-range 'test-property (1- end-of-region) nil)))
+      (should (equal (cons start-of-region end-of-region)
+                     (mastodon-tl--find-property-range 'test-property (1- end-of-region) t))))))
+
+(ert-deftest mastodon-tl--find-property-range--successful-finding-whole-buffer ()
+  "Should cope with a tag being set for the whole buffer."
+  (with-temp-buffer
+    (insert (propertize "Just some text with a the sought property" 'test-property 'set))
+
+    (should (equal (cons (point-min) (point-max))
+                   (mastodon-tl--find-property-range 'test-property 2 nil)))
+    (should (equal (cons (point-min) (point-max))
+                   (mastodon-tl--find-property-range 'test-property 2 t)))))
+
+(defun tl-tests--all-regions-with-property (property)
+  "Returns a list with (start . end) regions where PROPERTY is set."
+  (let (result
+        region)
+    (goto-char (point-min))
+    (while (and (< (point) (point-max))
+                (setq region (mastodon-tl--find-property-range property (point))))
+      (push region result)
+      (goto-char (min (point-max) (cdr region))))
+    (nreverse result)))
+
+
+(ert-deftest mastodon-tl--next-tab-item--with-spaces-at-ends ()
+  "Should do the correct tab actions."
+  (with-temp-buffer
+    ;; We build a buffer with 3 tab stops:  "...R1...R2R3..." (a dot
+    ;; represents text that is not part of a link, so R1 and R2 have a
+    ;; gap in between each other, R2 and R3 don't.
+    (insert "Random text at start")
+    (let ((start 2)
+          (r1 (point))
+          r2 gap r3
+          end)
+      (insert (propertize "R1 R1 R1" 'mastodon-tab-stop 'region1))
+      (setq gap (+ (point) 2))
+      (insert " a gap ")
+      (setq r2 (point))
+      (insert (propertize "R2 R2 R2" 'mastodon-tab-stop 'region2))
+      (setq r3 (point))
+      (insert (propertize "R3 R3 R3" 'mastodon-tab-stop 'region3))
+      (setq end (+ (point) 2))
+      (insert " more text at end")
+
+      (let ((test-cases
+             ;; a list 4-elemet lists of (test-name start-point
+             ;; expected-prev-stop expected-next-stop):
+             (list (list 'start start start r1)
+                   (list 'r1 r1 r1 r2)
+                   (list 'gap gap r1 r2)
+                   (list 'r2 r2 r1 r3)
+                   (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)))))))))))
+
+(ert-deftest mastodon-tl--next-tab-item--no-spaces-at-ends ()
+  "Should do the correct tab actions even with regions right at buffer ends."
+  (with-temp-buffer
+    ;; We build a buffer with 3 tab stops:  "R1...R2R3...R4" (a dot
+    ;; represents text that is not part of a link, so R1 and R2, and
+    ;; R3 and R4 have a gap in between each other, R2 and R3 don't.
+    (let ((r1 (point))
+          gap1 
+          r2 r3
+          gap2
+          r4)
+      (insert (propertize "R1 R1 R1" 'mastodon-tab-stop 'region1))
+      (setq gap1 (+ (point) 2))
+      (insert " a gap ")
+      (setq r2 (point))
+      (insert (propertize "R2 R2 R2" 'mastodon-tab-stop 'region2))
+      (setq r3 (point))
+      (insert (propertize "R3 R3 R3" 'mastodon-tab-stop 'region3))
+      (setq gap2 (+ (point) 2))
+      (insert " another gap ")
+      (setq r4 (point))
+      (insert (propertize "R4 R4 R4" 'mastodon-tab-stop 'region4))
+
+      (let ((test-cases
+             ;; a list 4-elemet lists of (test-name start-point
+             ;; expected-prev-stop expected-next-stop):
+             (list (list 'r1 r1 r1 r2)
+                   (list 'gap1 gap1 r1 r2)
+                   (list 'r2 r2 r1 r3)
+                   (list 'r3 r3 r2 r4)
+                   (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)))))))))))
+
+
+(defun tl-tests--property-values-at (property ranges)
+  "Returns a list with property values at the given ranges.
+
+The property value for PROPERTY within a region is assumed to be
+constant."
+  (let (result)
+    (dolist (range ranges (nreverse result))
+      (push (get-text-property (car range) property) result))))
+
+(ert-deftest mastodon-tl--update-timestamps-callback ()
+  "Should update the 5 timestamps at a time as expected."
+  (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.")))
+      (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)))))))))
+
+(ert-deftest mastodon-tl--has-spoiler ()
+  "Should be able to detect toots with spoiler text as expected"
+  (let* ((normal-toot mastodon-tl-test-base-toot)
+         (normal-toot-with-spoiler (cons '(spoiler_text . "spoiler") normal-toot))
+         (boosted-toot mastodon-tl-test-base-boosted-toot)
+         (boosted-toot-with-spoiler (cons (cons 'reblog normal-toot-with-spoiler)
+                                          boosted-toot)))
+    (should (null (mastodon-tl--has-spoiler normal-toot)))
+    (should-not (null (mastodon-tl--has-spoiler normal-toot-with-spoiler)))
+    (should (null (mastodon-tl--has-spoiler boosted-toot)))
+    (should-not (null (mastodon-tl--has-spoiler boosted-toot-with-spoiler)))))
+
+(ert-deftest mastodon-tl--spoiler ()
+  "Should render a toot with spoiler properly, with link that toggles the body."
+  (let ((normal-toot-with-spoiler (cons '(spoiler_text . "This is the spoiler warning text")
+                                        mastodon-tl-test-base-toot))
+        toot-start
+        toot-end
+        link-region
+        body-position)
+    (with-temp-buffer
+      (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)))
+      (setq toot-end (point))
+      (insert "\nsome more text.")
+
+      (goto-char toot-start)
+      (should (eq t (looking-at "This is the spoiler warning text")))
+
+      (setq link-region (mastodon-tl--find-next-or-previous-property-range
+                         'mastodon-tab-stop toot-start nil))
+      ;; There should be a link following the text:
+      (should-not (null link-region))
+      (goto-char (car link-region))
+      (should (eq t (looking-at "Content Warning")))
+
+      (setq body-position (+ 25 (cdr link-region))) ;; 25 is enough to skip the "\n--------------...."
+
+      ;; The text a bit after the link should be invisible:
+      (should (eq t (get-text-property body-position 'invisible)))
+
+      ;; Click the link:
+      (mastodon-tl--do-link-action-at-point (car link-region)) 
+
+      ;; The body is now visible:
+      (should (eq nil (get-text-property body-position 'invisible)))
+
+      ;; Click the link once more:
+      (mastodon-tl--do-link-action-at-point (car link-region)) 
+
+      ;; The body is invisible again:
+      (should (eq t (get-text-property body-position 'invisible))))))
diff --git a/test/mastodon-toot-tests.el b/test/mastodon-toot-tests.el
index e9d3b26..3e25536 100644
--- a/test/mastodon-toot-tests.el
+++ b/test/mastodon-toot-tests.el
@@ -1,5 +1,44 @@
 (require 'el-mock)
 
+(defconst mastodon-toot-multi-mention
+  '((mentions .
+              [((id . "1")
+                (username . "federated")
+                (url . "https://site.cafe/@federated")
+                (acct . "federated@federated.cafe"))
+               ((id . "1")
+                (username . "federated")
+                (url . "https://site.cafe/@federated")
+                (acct . "federated@federated.social"))
+               ((id . "1")
+                (username . "local")
+                (url . "")
+                (acct . "local"))])))
+
+(defconst mastodon-toot-no-mention
+  '((mentions . [])))
+
+(ert-deftest toot-multi-mentions ()
+  (let ((mastodon-auth--acct-alist '(("https://local.social". "null")))
+        (mastodon-instance-url "https://local.social"))    
+    (should (string=
+             (mastodon-toot--mentions mastodon-toot-multi-mention)
+             "@local@local.social @federated@federated.social @federated@federated.cafe "))))
+
+(ert-deftest toot-multi-mentions-with-name ()
+  (let ((mastodon-auth--acct-alist
+         '(("https://local.social". "local")))
+        (mastodon-instance-url "https://local.social"))
+    (should (string=
+             (mastodon-toot--mentions mastodon-toot-multi-mention)
+             "@federated@federated.social @federated@federated.cafe "))))
+
+(ert-deftest toot-no-mention ()
+  (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 ()
   (with-mock
     (mock (kill-buffer-and-window))