aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authormarty hiatt <martianhiatus [a t] riseup [d o t] net>2022-11-25 16:52:19 +0100
committermarty hiatt <martianhiatus [a t] riseup [d o t] net>2022-11-25 16:52:19 +0100
commita96049ab60e2a4822ddb4ee1956b8d4bc0cb85c0 (patch)
tree30df6ac63b7fc17811d0a5454b573856bfc268ff /test
parent9b0fdec55f6770d7c270e0a1e501ceb5e3ebcd95 (diff)
parent3717b6cb86c8d0037ca49d4f500a44560c9ac5ae (diff)
Merge branch 'develop' into capf-completion
Diffstat (limited to 'test')
-rw-r--r--test/mastodon-profile-tests.el5
-rw-r--r--test/mastodon-tl-tests.el16
2 files changed, 11 insertions, 10 deletions
diff --git a/test/mastodon-profile-tests.el b/test/mastodon-profile-tests.el
index 7478aaf..1ce9514 100644
--- a/test/mastodon-profile-tests.el
+++ b/test/mastodon-profile-tests.el
@@ -237,7 +237,7 @@ content generation in the function under test."
(if (version< emacs-version "27.1")
(mock (image-type-available-p 'imagemagick) => t)
(mock (image-transforms-p) => t))
- (mock (mastodon-http--get-json "https://instance.url/api/v1/accounts/1/statuses")
+ (mock (mastodon-http--get-json "https://instance.url/api/v1/accounts/1/statuses" nil)
=>
gargon-statuses-json)
(mock (mastodon-profile--get-statuses-pinned *)
@@ -271,7 +271,8 @@ content generation in the function under test."
"@Gargron\n"
" ------------\n"
"<p>Developer of Mastodon and administrator of mastodon.social. I post service announcements, development updates, and personal stuff.</p>\n"
- "_ Patreon __ :: <a href=\"https://www.patreon.com/mastodon\" rel=\"me nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://www.</span><span class=\"\">patreon.com/mastodon</span><span class=\"invisible\"></span></a>_ Homepage _ :: <a href=\"https://zeonfederated.com\" rel=\"me nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">zeonfederated.com</span><span class=\"invisible\"></span></a>\n"
+ "_ Patreon __ :: <a href=\"https://www.patreon.com/mastodon\" rel=\"me nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://www.</span><span class=\"\">patreon.com/mastodon</span><span class=\"invisible\"></span></a>_ Homepage _ :: <a href=\"https://zeonfederated.com\" rel=\"me nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">zeonfederated.com</span><span class=\"invisible\"></span></a>"
+ "\n"
"Joined March 2016"
"\n\n"
" ------------\n"
diff --git a/test/mastodon-tl-tests.el b/test/mastodon-tl-tests.el
index 0ac5caf..a80c3ee 100644
--- a/test/mastodon-tl-tests.el
+++ b/test/mastodon-tl-tests.el
@@ -317,7 +317,7 @@ Strict-Transport-Security: max-age=31536000
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)
@@ -340,7 +340,7 @@ Strict-Transport-Security: max-age=31536000
'mastodon-tl--byline-boosted))
"Account 42 (@acct42@example.space) 2999-99-99 00:11:22
------------
- ")))))
+")))))
(ert-deftest mastodon-tl--byline-boosted ()
"Should format the boosted toot correctly."
@@ -357,7 +357,7 @@ Strict-Transport-Security: max-age=31536000
'mastodon-tl--byline-boosted))
"(B) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
------------
- ")))))
+")))))
(ert-deftest mastodon-tl--byline-favorited ()
"Should format the favourited toot correctly."
@@ -374,7 +374,7 @@ Strict-Transport-Security: max-age=31536000
'mastodon-tl--byline-boosted))
"(F) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
------------
- ")))))
+")))))
(ert-deftest mastodon-tl--byline-boosted/favorited ()
@@ -392,7 +392,7 @@ Strict-Transport-Security: max-age=31536000
'mastodon-tl--byline-boosted))
"(B) (F) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
------------
- ")))))
+")))))
(ert-deftest mastodon-tl--byline-reblogged ()
"Should format the reblogged toot correctly."
@@ -418,7 +418,7 @@ Strict-Transport-Security: max-age=31536000
"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)
@@ -451,7 +451,7 @@ Strict-Transport-Security: max-age=31536000
"Account 42 (@acct42@example.space)
Boosted Account 43 (@acct43@example.space) original time
------------
- ")))))
+")))))
(ert-deftest mastodon-tl--byline-reblogged-boosted/favorited ()
"Should format the reblogged toot that was also boosted & favoritedcorrectly."
@@ -475,7 +475,7 @@ Strict-Transport-Security: max-age=31536000
"(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."