diff options
| author | lain <lain@soykaf.club> | 2020-06-20 09:33:18 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-06-20 09:33:18 +0000 |
| commit | 7d542450b13742c6efa93246c172c8306e730d50 (patch) | |
| tree | 86998336bba747f1ce605a1c06e39ac96f38b396 /test/web/mastodon_api/controllers/status_controller_test.exs | |
| parent | 4733f6a3371504ebb3eeb447d7c20d56c10b43bf (diff) | |
| parent | f9282677731cca96a1316e2830507837535c06e0 (diff) | |
| download | pleroma-7d542450b13742c6efa93246c172c8306e730d50.tar.gz pleroma-7d542450b13742c6efa93246c172c8306e730d50.zip | |
Merge branch 'develop' into '1865-media-only'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/web/mastodon_api/controllers/status_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/controllers/status_controller_test.exs | 2 |
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 |