pleroma

commit: 1b57522bba4bbe2843b7c68d37e0530387e5b8f3
parent: 4e4a3e5e13e204344f8c0974166756b9963d1dc0
Author: lain <lain@soykaf.club>
Date:   Mon,  2 Apr 2018 13:13:04 +0200

Fix some test stuff.

Diffstat:
M
lib/pleroma/gopher/server.ex
10
++++++++--
M
test/web/twitter_api/twitter_api_controller_test.exs
14
++++++--------

2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/lib/pleroma/gopher/server.ex b/lib/pleroma/gopher/server.ex
@@ -51,8 +51,9 @@ defmodule Pleroma.Gopher.Server.ProtocolHandler do
 
   def info(text) do
     text = String.replace(text, ~r/[\t\n]/, "")
+
     String.split(text, "\r")
-    |> Enum.map(fn (text) ->
+    |> Enum.map(fn text ->
       "i#{text}\tfake\(NULL)\t0\r\n"
     end)
     |> Enum.join("")
@@ -82,7 +83,12 @@ defmodule Pleroma.Gopher.Server.ProtocolHandler do
 
       link("Post ##{activity.id} by #{user.nickname}", "/notices/#{activity.id}") <>
         info("#{like_count} likes, #{announcement_count} repeats") <>
-        "\r\n" <> info(HtmlSanitizeEx.strip_tags(String.replace(activity.data["object"]["content"], "<br>", "\r")))
+        "\r\n" <>
+        info(
+          HtmlSanitizeEx.strip_tags(
+            String.replace(activity.data["object"]["content"], "<br>", "\r")
+          )
+        )
     end)
     |> Enum.join("\r\n")
   end
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -600,8 +600,9 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
         |> assign(:user, user)
         |> get("/api/statuses/followers")
 
-      assert json_response(conn, 200) ==
-               UserView.render("index.json", %{users: [follower_one, follower_two], for: user})
+      expected = UserView.render("index.json", %{users: [follower_one, follower_two], for: user})
+      result = json_response(conn, 200)
+      assert Enum.sort(expected) == Enum.sort(result)
     end
   end
 
@@ -620,12 +621,9 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
         |> assign(:user, user)
         |> get("/api/statuses/friends")
 
-      assert MapSet.equal?(
-               MapSet.new(json_response(conn, 200)),
-               MapSet.new(
-                 UserView.render("index.json", %{users: [followed_one, followed_two], for: user})
-               )
-             )
+      expected = UserView.render("index.json", %{users: [followed_one, followed_two], for: user})
+      result = json_response(conn, 200)
+      assert Enum.sort(expected) == Enum.sort(result)
     end
 
     test "it returns a given user's friends with user_id", %{conn: conn} do