Page MenuHomePhorge

No OneTemporary

Authored By
Unknown
Size
3 KB
Referenced Files
None
Subscribers
None
diff --git a/test/web/streamer_test.exs b/test/web/streamer_test.exs
index 51e2053fe..42ac91c03 100644
--- a/test/web/streamer_test.exs
+++ b/test/web/streamer_test.exs
@@ -1,105 +1,116 @@
defmodule Pleroma.Web.StreamerTest do
use Pleroma.DataCase
-
+ # use Pleroma.Web.ConnCase, async: true
alias Pleroma.Web.Streamer
alias Pleroma.User
alias Pleroma.Web.CommonAPI
- alias Pleroma.Web.MastodonAPI.MastodonSocket
alias Pleroma.Web.OAuth.{Authorization, Token}
alias Phoenix.ConnTest
+ alias Pleroma.Plugs.AuthenticationPlug
alias Plug.Conn
import Pleroma.Factory
+ alias Pleroma.Web.MastodonAPI.{MastodonSocket, MastodonAPIController}
defp create_sender_recipient() do
with object <- direct_note_factory(),
%{data: %{"actor" => actor_id, "to" => [recipient_id | _]}} <- object,
sender <- User.get_by_ap_id(actor_id),
recipient <- User.get_by_ap_id(recipient_id) do
%{sender: sender, recipient: recipient, object: object}
end
end
defp create_test_session_token(user) do
with app = insert(:mastodon_app),
{:ok, auth} <- Authorization.create_authorization(app, user) do
Token.exchange_token(app, auth)
end
end
+ @session_opts [
+ store: :cookie,
+ key: "_test",
+ signing_salt: "cooldude"
+ ]
+
test "it sends direct messages" do
%{sender: sender, recipient: recipient, object: object} = create_sender_recipient()
task =
Task.async(fn ->
- refute_receive {:text, _}, 4_000
+ assert_receive {:text, _}, 4_000
end)
{:ok, sender_token} = create_test_session_token(sender)
{:ok, recipient_token} = create_test_session_token(recipient)
recipient_socket = %{transport_pid: task.pid}
recipient_params = %{access_token: recipient_token, stream: "direct"}
MastodonSocket.connect(recipient_socket, recipient_params)
sender_conn =
ConnTest.build_conn()
- |> Conn.fetch_session()
+ |> Plug.Session.call(Plug.Session.init(@session_opts))
+ |> Conn.assign(:user, sender)
+ |> Conn.fetch_session
|> Conn.put_session(:oauth_token, sender_token.token)
- MastodonAPI.post_status(sender_conn, %{"status" => object})
+ IO.inspect sender_conn
+ IO.inspect object
+ MastodonAPIController.post_status(sender_conn, %{"status" => object})
Task.await(task)
end
test "it sends to public" do
user = insert(:user)
other_user = insert(:user)
task =
Task.async(fn ->
assert_receive {:text, _}, 4_000
end)
fake_socket = %{
transport_pid: task.pid,
assigns: %{
user: user
}
}
{:ok, activity} = CommonAPI.post(other_user, %{"status" => "Test"})
topics = %{
"public" => [fake_socket]
}
Streamer.push_to_socket(topics, "public", activity)
Task.await(task)
end
test "it doesn't send to blocked users" do
user = insert(:user)
blocked_user = insert(:user)
{:ok, user} = User.block(user, blocked_user)
task =
Task.async(fn ->
refute_receive {:text, _}, 1_000
end)
fake_socket = %{
transport_pid: task.pid,
assigns: %{
user: user
}
}
{:ok, activity} = CommonAPI.post(blocked_user, %{"status" => "Test"})
topics = %{
"public" => [fake_socket]
}
Streamer.push_to_socket(topics, "public", activity)
Task.await(task)
end
end

File Metadata

Mime Type
text/x-diff
Expires
Tue, Nov 17, 11:39 AM (5 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1839496
Default Alt Text
(3 KB)

Event Timeline