X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Factivity_test.exs;h=ad889f544830a5ed8463312461c5ee35bdd3b7af;hb=d5d91ae689e14103551dd3622e208ea31e40c858;hp=87c9ddc50f5139707d6c4700e85268165bf2d80a;hpb=0f412cf6e68fcebda3e94b71b7f182af689748bf;p=akkoma

diff --git a/test/activity_test.exs b/test/activity_test.exs
index 87c9ddc50..ad889f544 100644
--- a/test/activity_test.exs
+++ b/test/activity_test.exs
@@ -1,3 +1,7 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.ActivityTest do
   use Pleroma.DataCase
   alias Pleroma.Activity
@@ -5,14 +9,14 @@ defmodule Pleroma.ActivityTest do
 
   test "returns an activity by it's AP id" do
     activity = insert(:note_activity)
-    found_activity = Pleroma.Activity.get_by_ap_id(activity.data["id"])
+    found_activity = Activity.get_by_ap_id(activity.data["id"])
 
     assert activity == found_activity
   end
 
   test "returns activities by it's objects AP ids" do
     activity = insert(:note_activity)
-    [found_activity] = Pleroma.Activity.all_by_object_ap_id(activity.data["object"]["id"])
+    [found_activity] = Activity.get_all_create_by_object_ap_id(activity.data["object"]["id"])
 
     assert activity == found_activity
   end
@@ -20,33 +24,8 @@ defmodule Pleroma.ActivityTest do
   test "returns the activity that created an object" do
     activity = insert(:note_activity)
 
-    found_activity =
-      Pleroma.Activity.get_create_activity_by_object_ap_id(activity.data["object"]["id"])
+    found_activity = Activity.get_create_by_object_ap_id(activity.data["object"]["id"])
 
     assert activity == found_activity
   end
-
-  test "returns tombstone" do
-    activity = insert(:note_activity)
-    deleted = DateTime.utc_now()
-
-    assert Pleroma.Activity.get_tombstone(activity, deleted) == %{
-             id: activity.data["object"]["id"],
-             context: activity.data["context"],
-             type: "tombstone",
-             published: activity.data["published"],
-             deleted: deleted
-           }
-  end
-
-  test "swaps data with tombstone" do
-    activity = insert(:note_activity)
-
-    {:ok, deleted} = Pleroma.Activity.swap_data_with_tombstone(activity)
-    assert deleted.data.type == "tombstone"
-
-    found_activity = Repo.get(Activity, activity.id)
-
-    assert deleted.data.type == found_activity.data["type"]
-  end
 end