X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fpleroma%2Fweb%2Fstreamer_test.exs;h=841db0e91144bb811ac72b6d030979903890be18;hb=0f132b802dde7f217ecb07767e0d34e3edb517b7;hp=0402e59ea495f3756a8712b0ad0cc7f0ec6e7386;hpb=e3508988283a0902a7e330995a0c224811956bce;p=akkoma

diff --git a/test/pleroma/web/streamer_test.exs b/test/pleroma/web/streamer_test.exs
index 0402e59ea..841db0e91 100644
--- a/test/pleroma/web/streamer_test.exs
+++ b/test/pleroma/web/streamer_test.exs
@@ -7,15 +7,11 @@ defmodule Pleroma.Web.StreamerTest do
 
   import Pleroma.Factory
 
-  alias Pleroma.Chat
-  alias Pleroma.Chat.MessageReference
   alias Pleroma.Conversation.Participation
   alias Pleroma.List
-  alias Pleroma.Object
   alias Pleroma.User
   alias Pleroma.Web.CommonAPI
   alias Pleroma.Web.Streamer
-  alias Pleroma.Web.StreamerView
 
   @moduletag needs_streamer: true, capture_log: true
 
@@ -80,20 +76,16 @@ defmodule Pleroma.Web.StreamerTest do
       expected_user_topic = "user:#{user.id}"
       expected_notification_topic = "user:notification:#{user.id}"
       expected_direct_topic = "direct:#{user.id}"
-      expected_pleroma_chat_topic = "user:pleroma_chat:#{user.id}"
 
       for valid_user_token <- [read_oauth_token, read_statuses_token] do
         assert {:ok, ^expected_user_topic} = Streamer.get_topic("user", user, valid_user_token)
 
         assert {:ok, ^expected_direct_topic} =
                  Streamer.get_topic("direct", user, valid_user_token)
-
-        assert {:ok, ^expected_pleroma_chat_topic} =
-                 Streamer.get_topic("user:pleroma_chat", user, valid_user_token)
       end
 
       for invalid_user_token <- [read_notifications_token, badly_scoped_token],
-          user_topic <- ["user", "direct", "user:pleroma_chat"] do
+          user_topic <- ["user", "direct"] do
         assert {:error, :unauthorized} = Streamer.get_topic(user_topic, user, invalid_user_token)
       end
 
@@ -257,66 +249,6 @@ defmodule Pleroma.Web.StreamerTest do
       refute Streamer.filtered_by_user?(user, notify)
     end
 
-    test "it sends chat messages to the 'user:pleroma_chat' stream", %{
-      user: user,
-      token: oauth_token
-    } do
-      other_user = insert(:user)
-
-      {:ok, create_activity} =
-        CommonAPI.post_chat_message(other_user, user, "hey cirno", idempotency_key: "123")
-
-      object = Object.normalize(create_activity, fetch: false)
-      chat = Chat.get(user.id, other_user.ap_id)
-      cm_ref = MessageReference.for_chat_and_object(chat, object)
-      cm_ref = %{cm_ref | chat: chat, object: object}
-
-      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})
-
-      assert text =~ "hey cirno"
-      assert_receive {:text, ^text}
-    end
-
-    test "it sends chat messages to the 'user' stream", %{user: user, token: oauth_token} do
-      other_user = insert(:user)
-
-      {:ok, create_activity} = CommonAPI.post_chat_message(other_user, user, "hey cirno")
-      object = Object.normalize(create_activity, fetch: false)
-      chat = Chat.get(user.id, other_user.ap_id)
-      cm_ref = MessageReference.for_chat_and_object(chat, object)
-      cm_ref = %{cm_ref | chat: chat, object: object}
-
-      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})
-
-      assert text =~ "hey cirno"
-      assert_receive {:text, ^text}
-    end
-
-    test "it sends chat message notifications to the 'user:notification' stream", %{
-      user: user,
-      token: oauth_token
-    } do
-      other_user = insert(:user)
-
-      {:ok, create_activity} = CommonAPI.post_chat_message(other_user, user, "hey")
-
-      notify =
-        Repo.get_by(Pleroma.Notification, user_id: user.id, activity_id: create_activity.id)
-        |> Repo.preload(:activity)
-
-      Streamer.get_topic_and_add_socket("user:notification", user, oauth_token)
-      Streamer.stream("user:notification", notify)
-
-      assert_receive {:render_with_user, _, _, ^notify}
-      refute Streamer.filtered_by_user?(user, notify)
-    end
-
     test "it doesn't send notify to the 'user:notification' stream when a user is blocked", %{
       user: user,
       token: oauth_token
@@ -383,19 +315,8 @@ defmodule Pleroma.Web.StreamerTest do
       user: user,
       token: oauth_token
     } do
-      user_url = user.ap_id
       user2 = insert(:user)
 
-      body =
-        File.read!("test/fixtures/users_mock/localhost.json")
-        |> String.replace("{{nickname}}", user.nickname)
-        |> Jason.encode!()
-
-      Tesla.Mock.mock_global(fn
-        %{method: :get, url: ^user_url} ->
-          %Tesla.Env{status: 200, body: body}
-      end)
-
       Streamer.get_topic_and_add_socket("user:notification", user, oauth_token)
       {:ok, _follower, _followed, follow_activity} = CommonAPI.follow(user2, user)
 
@@ -409,20 +330,9 @@ defmodule Pleroma.Web.StreamerTest do
       token: oauth_token
     } do
       user_id = user.id
-      user_url = user.ap_id
       other_user = insert(:user)
       other_user_id = other_user.id
 
-      body =
-        File.read!("test/fixtures/users_mock/localhost.json")
-        |> String.replace("{{nickname}}", user.nickname)
-        |> Jason.encode!()
-
-      Tesla.Mock.mock_global(fn
-        %{method: :get, url: ^user_url} ->
-          %Tesla.Env{status: 200, body: body}
-      end)
-
       Streamer.get_topic_and_add_socket("user", user, oauth_token)
       {:ok, _follower, _followed, _follow_activity} = CommonAPI.follow(user, other_user)
 
@@ -510,7 +420,7 @@ defmodule Pleroma.Web.StreamerTest do
 
   describe "thread_containment/2" do
     test "it filters to user if recipients invalid and thread containment is enabled" do
-      Pleroma.Config.put([:instance, :skip_thread_containment], false)
+      clear_config([:instance, :skip_thread_containment], false)
       author = insert(:user)
       %{user: user, token: oauth_token} = oauth_access(["read"])
       User.follow(user, author, :follow_accept)
@@ -531,7 +441,7 @@ defmodule Pleroma.Web.StreamerTest do
     end
 
     test "it sends message if recipients invalid and thread containment is disabled" do
-      Pleroma.Config.put([:instance, :skip_thread_containment], true)
+      clear_config([:instance, :skip_thread_containment], true)
       author = insert(:user)
       %{user: user, token: oauth_token} = oauth_access(["read"])
       User.follow(user, author, :follow_accept)
@@ -553,7 +463,7 @@ defmodule Pleroma.Web.StreamerTest do
     end
 
     test "it sends message if recipients invalid and thread containment is enabled but user's thread containment is disabled" do
-      Pleroma.Config.put([:instance, :skip_thread_containment], false)
+      clear_config([:instance, :skip_thread_containment], false)
       author = insert(:user)
       user = insert(:user, skip_thread_containment: true)
       %{token: oauth_token} = oauth_access(["read"], user: user)
@@ -794,6 +704,7 @@ defmodule Pleroma.Web.StreamerTest do
       refute_receive _
     end
 
+    @tag :erratic
     test "it sends conversation update to the 'direct' stream when a message is deleted", %{
       user: user,
       token: oauth_token