projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'active-user-count' into 'develop'
[akkoma]
/
test
/
pleroma
/
web
/
pleroma_api
/
controllers
/
chat_controller_test.exs
diff --git
a/test/pleroma/web/pleroma_api/controllers/chat_controller_test.exs
b/test/pleroma/web/pleroma_api/controllers/chat_controller_test.exs
index 24efeeb73a36ef445a34ceec718fab2df7601ae5..372613b8bdeb1e9b8d160f4aab37fcf012c9c96c 100644
(file)
--- a/
test/pleroma/web/pleroma_api/controllers/chat_controller_test.exs
+++ b/
test/pleroma/web/pleroma_api/controllers/chat_controller_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
use Pleroma.Web.ConnCase
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
use Pleroma.Web.ConnCase
@@
-211,12
+211,12
@@
defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
assert String.match?(
next,
assert String.match?(
next,
- ~r(#{api_endpoint}.*/messages\?
id=.*&
limit=\d+&max_id=.*; rel=\"next\"$)
+ ~r(#{api_endpoint}.*/messages\?limit=\d+&max_id=.*; rel=\"next\"$)
)
assert String.match?(
prev,
)
assert String.match?(
prev,
- ~r(#{api_endpoint}.*/messages\?
id=.*&
limit=\d+&min_id=.*; rel=\"prev\"$)
+ ~r(#{api_endpoint}.*/messages\?limit=\d+&min_id=.*; rel=\"prev\"$)
)
assert length(result) == 20
)
assert length(result) == 20
@@
-229,12
+229,12
@@
defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
assert String.match?(
next,
assert String.match?(
next,
- ~r(#{api_endpoint}.*/messages\?
id=.*&
limit=\d+&max_id=.*; rel=\"next\"$)
+ ~r(#{api_endpoint}.*/messages\?limit=\d+&max_id=.*; rel=\"next\"$)
)
assert String.match?(
prev,
)
assert String.match?(
prev,
- ~r(#{api_endpoint}.*/messages\?
id=.*&
limit=\d+&max_id=.*&min_id=.*; rel=\"prev\"$)
+ ~r(#{api_endpoint}.*/messages\?limit=\d+&max_id=.*&min_id=.*; rel=\"prev\"$)
)
assert length(result) == 10
)
assert length(result) == 10