Merge branch 'params-always-in-http-el' into develop

3 files changed, 35 insertions, 27 deletions

diff --git a/test/mastodon-notifications-tests.el b/test/mastodon-notifications-tests.el
index 1275c72..942a7cb 100644
--- a/test/mastodon-notifications-tests.el
+++ b/test/mastodon-notifications-tests.el
@@ -187,9 +187,9 @@
   "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"))
-     (mock (mastodon-profile--fetch-server-account-settings)
-           => '(max_toot_chars 1312 privacy "public" display_name "Eugen" discoverable t locked :json-false bot :json-false sensitive :json-false language ""))
+      (mock (mastodon-http--get-json "https://instance.url/api/v1/notifications" nil))
+      (mock (mastodon-profile--fetch-server-account-settings)
+            => '(max_toot_chars 1312 privacy "public" display_name "Eugen" discoverable t locked :json-false bot :json-false sensitive :json-false language ""))
 
      (mastodon-notifications-get))))
 
diff --git a/test/mastodon-profile-tests.el b/test/mastodon-profile-tests.el
index 704f2ce..7478aaf 100644
--- a/test/mastodon-profile-tests.el
+++ b/test/mastodon-profile-tests.el
@@ -172,7 +172,8 @@ The search will happen as if called without the \"@\"."
   (with-mock
 
     (mock (mastodon-http--get-json
-           "https://instance.url/api/v1/accounts/search?q=gargron"))
+           "https://instance.url/api/v1/accounts/search"
+           '(("q" . "gargron"))))
 
     (let ((mastodon-instance-url "https://instance.url"))
       ;; We don't check anything from the return value. We only care
@@ -182,7 +183,9 @@ The search will happen as if called without the \"@\"."
 (ert-deftest mastodon-profile--search-account-by-handle--filters-out-false-results ()
   "Should ignore results that don't match the searched handle."
   (with-mock
-    (mock (mastodon-http--get-json *)
+    (mock (mastodon-http--get-json
+           "https://instance.url/api/v1/accounts/search"
+           '(("q" . "Gargron")))
           =>
           (vector ccc-profile-json gargron-profile-json))
 
@@ -197,7 +200,9 @@ The search will happen as if called without the \"@\"."
 
 TODO: We need to decide if this is actually desired or not."
   (with-mock
-    (mock (mastodon-http--get-json *) => (vector gargron-profile-json))
+    (mock (mastodon-http--get-json *
+                                   '(("q" . "gargron")))
+          => (vector gargron-profile-json))
 
     (let ((mastodon-instance-url "https://instance.url"))
       (should
diff --git a/test/mastodon-tl-tests.el b/test/mastodon-tl-tests.el
index 19934dd..0ac5caf 100644
--- a/test/mastodon-tl-tests.el
+++ b/test/mastodon-tl-tests.el
@@ -175,27 +175,30 @@ Strict-Transport-Security: max-age=31536000
   "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 mastodon-tl--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."
+  `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"))
+      (mock (mastodon-http--get-json "https://instance.url/api/v1/timelines/foo"
+                                     '(("max_id" . "12345"))))
       (mastodon-tl--more-json "timelines/foo" "12345"))))
 
 (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
-a string or a numeric."
+  `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"))
+      (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 ()
@@ -314,7 +317,7 @@ a string or a numeric."
 			              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)
@@ -337,7 +340,7 @@ a string or a numeric."
                                              '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."
@@ -354,7 +357,7 @@ a string or a numeric."
                                              '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."
@@ -371,7 +374,7 @@ a string or a numeric."
                                              'mastodon-tl--byline-boosted))
                        "(F) Account 42 (@acct42@example.space) 2999-99-99 00:11:22
   ------------
-")))))
+  ")))))
 
 
 (ert-deftest mastodon-tl--byline-boosted/favorited ()
@@ -389,7 +392,7 @@ a string or a numeric."
                                              '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."
@@ -413,9 +416,9 @@ a string or a numeric."
 	        (handle2-location 65))
         (should (string= (substring-no-properties byline)
 			             "Account 42 (@acct42@example.space)
- Boosted Account 43 (@acct43@example.space) original time
+  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)
@@ -446,9 +449,9 @@ a string or a numeric."
                                              'mastodon-tl--byline-author
                                              'mastodon-tl--byline-boosted))
                        "Account 42 (@acct42@example.space)
- Boosted Account 43 (@acct43@example.space) original time
+  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."
@@ -470,9 +473,9 @@ a string or a numeric."
                                              'mastodon-tl--byline-author
                                              'mastodon-tl--byline-boosted))
                        "(B) (F) Account 42 (@acct42@example.space)
- Boosted Account 43 (@acct43@example.space) original time
+  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."
@@ -808,8 +811,8 @@ a string or a numeric."
 (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."
+  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))))