summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/status_controller_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-06-23 10:17:12 +0200
committerlain <lain@soykaf.club>2020-06-23 10:17:12 +0200
commit2c603f20098d7f342e1cbad8e6a6c86b007c5a99 (patch)
treedd9a339daed6a25e758167413d9231e22ce42ac4 /test/web/mastodon_api/controllers/status_controller_test.exs
parentb05f795326b77edd881ffea2c004d7ca0ddd7df9 (diff)
parent3875a507d4b52df7edbda376d3ed31ad52241ac5 (diff)
downloadpleroma-2c603f20098d7f342e1cbad8e6a6c86b007c5a99.tar.gz
pleroma-2c603f20098d7f342e1cbad8e6a6c86b007c5a99.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
Diffstat (limited to 'test/web/mastodon_api/controllers/status_controller_test.exs')
-rw-r--r--test/web/mastodon_api/controllers/status_controller_test.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/mastodon_api/controllers/status_controller_test.exs b/test/web/mastodon_api/controllers/status_controller_test.exs
index 648e6f2ce..a98e939e8 100644
--- a/test/web/mastodon_api/controllers/status_controller_test.exs
+++ b/test/web/mastodon_api/controllers/status_controller_test.exs
@@ -1561,7 +1561,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
# Using the header for pagination works correctly
[next, _] = get_resp_header(result, "link") |> hd() |> String.split(", ")
- [_, max_id] = Regex.run(~r/max_id=(.*)>;/, next)
+ [_, max_id] = Regex.run(~r/max_id=([^&]+)/, next)
assert max_id == third_favorite.id