summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/pleroma/integration/mastodon_websocket_test.exs46
-rw-r--r--test/pleroma/web/streamer_test.exs14
2 files changed, 37 insertions, 23 deletions
diff --git a/test/pleroma/integration/mastodon_websocket_test.exs b/test/pleroma/integration/mastodon_websocket_test.exs
index d2e98df3b..21e7ca2b0 100644
--- a/test/pleroma/integration/mastodon_websocket_test.exs
+++ b/test/pleroma/integration/mastodon_websocket_test.exs
@@ -95,7 +95,7 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
assert {:ok,
%{
- "event" => "pleroma.respond",
+ "event" => "pleroma:respond",
"payload" => %{"type" => "subscribe", "result" => "success"}
}} = decode_json(raw_json)
@@ -124,16 +124,20 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
assert {:ok,
%{
- "event" => "pleroma.respond",
+ "event" => "pleroma:respond",
"payload" => %{"type" => "subscribe", "result" => "success"}
}} = decode_json(raw_json)
- WebsocketClient.send_text(pid, %{type: "subscribe", stream: "hashtag", tag: "mew"} |> Jason.encode!())
+ WebsocketClient.send_text(
+ pid,
+ %{type: "subscribe", stream: "hashtag", tag: "mew"} |> Jason.encode!()
+ )
+
assert_receive {:text, raw_json}, 1_000
assert {:ok,
%{
- "event" => "pleroma.respond",
+ "event" => "pleroma:respond",
"payload" => %{"type" => "subscribe", "result" => "success"}
}} = decode_json(raw_json)
@@ -157,7 +161,7 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
assert {:ok,
%{
- "event" => "pleroma.respond",
+ "event" => "pleroma:respond",
"payload" => %{"type" => "subscribe", "result" => "success"}
}} = decode_json(raw_json)
@@ -166,7 +170,7 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
assert {:ok,
%{
- "event" => "pleroma.respond",
+ "event" => "pleroma:respond",
"payload" => %{"type" => "subscribe", "result" => "ignored"}
}} = decode_json(raw_json)
@@ -184,7 +188,7 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
assert {:ok,
%{
- "event" => "pleroma.respond",
+ "event" => "pleroma:respond",
"payload" => %{"type" => "subscribe", "result" => "success"}
}} = decode_json(raw_json)
@@ -193,7 +197,7 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
assert {:ok,
%{
- "event" => "pleroma.respond",
+ "event" => "pleroma:respond",
"payload" => %{"type" => "unsubscribe", "result" => "success"}
}} = decode_json(raw_json)
@@ -262,15 +266,15 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
WebsocketClient.send_text(
pid,
- %{type: "pleroma.authenticate", token: token.token} |> Jason.encode!()
+ %{type: "pleroma:authenticate", token: token.token} |> Jason.encode!()
)
assert_receive {:text, raw_json}, 1_000
assert {:ok,
%{
- "event" => "pleroma.respond",
- "payload" => %{"type" => "pleroma.authenticate", "result" => "success"}
+ "event" => "pleroma:respond",
+ "payload" => %{"type" => "pleroma:authenticate", "result" => "success"}
}} = decode_json(raw_json)
WebsocketClient.send_text(pid, %{type: "subscribe", stream: "user"} |> Jason.encode!())
@@ -278,7 +282,7 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
assert {:ok,
%{
- "event" => "pleroma.respond",
+ "event" => "pleroma:respond",
"payload" => %{"type" => "subscribe", "result" => "success"}
}} = decode_json(raw_json)
end
@@ -288,16 +292,16 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
WebsocketClient.send_text(
pid,
- %{type: "pleroma.authenticate", token: "Something else"} |> Jason.encode!()
+ %{type: "pleroma:authenticate", token: "Something else"} |> Jason.encode!()
)
assert_receive {:text, raw_json}, 1_000
assert {:ok,
%{
- "event" => "pleroma.respond",
+ "event" => "pleroma:respond",
"payload" => %{
- "type" => "pleroma.authenticate",
+ "type" => "pleroma:authenticate",
"result" => "error",
"error" => "unauthorized"
}
@@ -309,29 +313,29 @@ defmodule Pleroma.Integration.MastodonWebsocketTest do
WebsocketClient.send_text(
pid,
- %{type: "pleroma.authenticate", token: token.token} |> Jason.encode!()
+ %{type: "pleroma:authenticate", token: token.token} |> Jason.encode!()
)
assert_receive {:text, raw_json}, 1_000
assert {:ok,
%{
- "event" => "pleroma.respond",
- "payload" => %{"type" => "pleroma.authenticate", "result" => "success"}
+ "event" => "pleroma:respond",
+ "payload" => %{"type" => "pleroma:authenticate", "result" => "success"}
}} = decode_json(raw_json)
WebsocketClient.send_text(
pid,
- %{type: "pleroma.authenticate", token: "Something else"} |> Jason.encode!()
+ %{type: "pleroma:authenticate", token: "Something else"} |> Jason.encode!()
)
assert_receive {:text, raw_json}, 1_000
assert {:ok,
%{
- "event" => "pleroma.respond",
+ "event" => "pleroma:respond",
"payload" => %{
- "type" => "pleroma.authenticate",
+ "type" => "pleroma:authenticate",
"result" => "error",
"error" => "already_authenticated"
}
diff --git a/test/pleroma/web/streamer_test.exs b/test/pleroma/web/streamer_test.exs
index cc57a2989..d85358fd4 100644
--- a/test/pleroma/web/streamer_test.exs
+++ b/test/pleroma/web/streamer_test.exs
@@ -355,7 +355,12 @@ defmodule Pleroma.Web.StreamerTest do
Streamer.get_topic_and_add_socket("user:pleroma_chat", user, oauth_token)
Streamer.stream("user:pleroma_chat", {user, cm_ref})
- text = StreamerView.render("chat_update.json", %{chat_message_reference: cm_ref}, "user:pleroma_chat:#{user.id}")
+ text =
+ StreamerView.render(
+ "chat_update.json",
+ %{chat_message_reference: cm_ref},
+ "user:pleroma_chat:#{user.id}"
+ )
assert text =~ "hey cirno"
assert_receive {:text, ^text}
@@ -373,7 +378,12 @@ defmodule Pleroma.Web.StreamerTest do
Streamer.get_topic_and_add_socket("user", user, oauth_token)
Streamer.stream("user", {user, cm_ref})
- text = StreamerView.render("chat_update.json", %{chat_message_reference: cm_ref}, "user:#{user.id}")
+ text =
+ StreamerView.render(
+ "chat_update.json",
+ %{chat_message_reference: cm_ref},
+ "user:#{user.id}"
+ )
assert text =~ "hey cirno"
assert_receive {:text, ^text}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-10 02:41:47 +0000