Merge branch 'develop' into issue/1383

1 files changed, 3 insertions, 4 deletions

diff --git a/test/web/mastodon_api/views/status_view_test.exs b/test/web/mastodon_api/views/status_view_test.exs
index b54b19c0b..069bb8eac 100644
--- a/test/web/mastodon_api/views/status_view_test.exs
+++ b/test/web/mastodon_api/views/status_view_test.exs
@@ -31,13 +31,12 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
     {:ok, activity} = CommonAPI.post(user, %{"status" => "dae cofe??"})
 
     {:ok, _, _} = CommonAPI.react_with_emoji(activity.id, user, "☕")
-    {:ok, _, _} = CommonAPI.react_with_emoji(activity.id, other_user, "☕")
     {:ok, _, _} = CommonAPI.react_with_emoji(activity.id, third_user, "🍵")
+    {:ok, _, _} = CommonAPI.react_with_emoji(activity.id, other_user, "☕")
     activity = Repo.get(Activity, activity.id)
     status = StatusView.render("show.json", activity: activity)
 
-    assert status[:pleroma][:emoji_reactions]["🍵"] == 1
-    assert status[:pleroma][:emoji_reactions]["☕"] == 2
+    assert status[:pleroma][:emoji_reactions] == [["☕", 2], ["🍵", 1]]
   end
 
   test "loads and returns the direct conversation id when given the `with_direct_conversation_id` option" do
@@ -189,7 +188,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
         expires_at: nil,
         direct_conversation_id: nil,
         thread_muted: false,
-        emoji_reactions: %{}
+        emoji_reactions: []
       }
     }