X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=test%2Fpleroma%2Fweb%2Factivity_pub%2Ftransmogrifier%2Fquestion_handling_test.exs;h=54cbb9c6526225604a5b9d331c083f1c6e2480d7;hb=62e179f446ac7bfada965fac47e9613ce60091b4;hp=d2822ce75b3e9155f5381ca498b64f732e261607;hpb=1172844ed18d94d84724dc6f11c6e9f72e0ba6ec;p=akkoma

diff --git a/test/pleroma/web/activity_pub/transmogrifier/question_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/question_handling_test.exs
index d2822ce75..54cbb9c65 100644
--- a/test/pleroma/web/activity_pub/transmogrifier/question_handling_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier/question_handling_test.exs
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.ActivityPub.Transmogrifier.QuestionHandlingTest do
@@ -18,11 +18,11 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.QuestionHandlingTest do
   end
 
   test "Mastodon Question activity" do
-    data = File.read!("test/fixtures/mastodon-question-activity.json") |> Poison.decode!()
+    data = File.read!("test/fixtures/mastodon-question-activity.json") |> Jason.decode!()
 
     {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
 
-    object = Object.normalize(activity, false)
+    object = Object.normalize(activity, fetch: false)
 
     assert object.data["url"] == "https://mastodon.sdf.org/@rinpatch/102070944809637304"
 
@@ -33,8 +33,6 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.QuestionHandlingTest do
     assert object.data["context"] ==
              "tag:mastodon.sdf.org,2019-05-10:objectId=15095122:objectType=Conversation"
 
-    assert object.data["context_id"]
-
     assert object.data["anyOf"] == []
 
     assert Enum.sort(object.data["oneOf"]) ==
@@ -65,10 +63,9 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.QuestionHandlingTest do
 
     {:ok, reply_activity} = CommonAPI.post(user, %{status: "hewwo", in_reply_to_id: activity.id})
 
-    reply_object = Object.normalize(reply_activity, false)
+    reply_object = Object.normalize(reply_activity, fetch: false)
 
     assert reply_object.data["context"] == object.data["context"]
-    assert reply_object.data["context_id"] == object.data["context_id"]
   end
 
   test "Mastodon Question activity with HTML tags in plaintext" do
@@ -97,11 +94,11 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.QuestionHandlingTest do
 
     data =
       File.read!("test/fixtures/mastodon-question-activity.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Kernel.put_in(["object", "oneOf"], options)
 
     {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
-    object = Object.normalize(activity, false)
+    object = Object.normalize(activity, fetch: false)
 
     assert Enum.sort(object.data["oneOf"]) == Enum.sort(options)
   end
@@ -142,12 +139,12 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.QuestionHandlingTest do
 
     data =
       File.read!("test/fixtures/mastodon-question-activity.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Kernel.put_in(["object", "oneOf"], options)
       |> Kernel.put_in(["object", "tag"], tag)
 
     {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
-    object = Object.normalize(activity, false)
+    object = Object.normalize(activity, fetch: false)
 
     assert object.data["oneOf"] == options
 
@@ -158,7 +155,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.QuestionHandlingTest do
   end
 
   test "returns same activity if received a second time" do
-    data = File.read!("test/fixtures/mastodon-question-activity.json") |> Poison.decode!()
+    data = File.read!("test/fixtures/mastodon-question-activity.json") |> Jason.decode!()
 
     assert {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
 
@@ -168,7 +165,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.QuestionHandlingTest do
   test "accepts a Question with no content" do
     data =
       File.read!("test/fixtures/mastodon-question-activity.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Kernel.put_in(["object", "content"], "")
 
     assert {:ok, %Activity{local: false}} = Transmogrifier.handle_incoming(data)