Merge branch 'develop' into 'remove-twitter-api'

[akkoma] / test / bbs / handler_test.exs

diff --git a/test/bbs/handler_test.exs b/test/bbs/handler_test.exs
index 1386a2d169f377a7b12e92c157d907b0dcab46be..eb716486ece45594e44571d81f71f9c8e0c3155b 100644 (file)
--- a/test/bbs/handler_test.exs
+++ b/test/bbs/handler_test.exs
@@ -1,10 +1,15 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.BBS.HandlerTest do
   use Pleroma.DataCase
   alias Pleroma.Activity
   alias Pleroma.BBS.Handler
-  alias Pleroma.Web.CommonAPI
+  alias Pleroma.Object
   alias Pleroma.Repo
   alias Pleroma.User
+  alias Pleroma.Web.CommonAPI
 
   import ExUnit.CaptureIO
   import Pleroma.Factory
@@ -16,8 +21,8 @@ defmodule Pleroma.BBS.HandlerTest do
 
     {:ok, user} = User.follow(user, followed)
 
-    {:ok, _first} = CommonAPI.post(user, %{"status" => "hey"})
-    {:ok, _second} = CommonAPI.post(followed, %{"status" => "hello"})
+    {:ok, _first} = CommonAPI.post(user, %{status: "hey"})
+    {:ok, _second} = CommonAPI.post(followed, %{status: "hello"})
 
     output =
       capture_io(fn ->
@@ -49,14 +54,16 @@ defmodule Pleroma.BBS.HandlerTest do
       )
 
     assert activity.actor == user.ap_id
-    assert activity.data["object"]["content"] == "this is a test post"
+    object = Object.normalize(activity)
+    assert object.data["content"] == "this is a test post"
   end
 
   test "replying" do
     user = insert(:user)
     another_user = insert(:user)
 
-    {:ok, activity} = CommonAPI.post(another_user, %{"status" => "this is a test post"})
+    {:ok, activity} = CommonAPI.post(another_user, %{status: "this is a test post"})
+    activity_object = Object.normalize(activity)
 
     output =
       capture_io(fn ->
@@ -74,7 +81,9 @@ defmodule Pleroma.BBS.HandlerTest do
       )
 
     assert reply.actor == user.ap_id
-    assert reply.data["object"]["content"] == "this is a reply"
-    assert reply.data["object"]["inReplyTo"] == activity.data["object"]["id"]
+
+    reply_object_data = Object.normalize(reply).data
+    assert reply_object_data["content"] == "this is a reply"
+    assert reply_object_data["inReplyTo"] == activity_object.data["id"]
   end
 end