projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/oauth-page-responsiveness' into 'develop'
[akkoma]
/
test
/
activity_test.exs
diff --git
a/test/activity_test.exs
b/test/activity_test.exs
index 55849c5221b5c00a84afd53f572bacd72696a64f..ad889f544830a5ed8463312461c5ee35bdd3b7af 100644
(file)
--- a/
test/activity_test.exs
+++ b/
test/activity_test.exs
@@
-1,17
+1,22
@@
+# 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
defmodule Pleroma.ActivityTest do
use Pleroma.DataCase
+ alias Pleroma.Activity
import Pleroma.Factory
test "returns an activity by it's AP id" do
activity = insert(:note_activity)
import Pleroma.Factory
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)
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
assert activity == found_activity
end
@@
-19,8
+24,7
@@
defmodule Pleroma.ActivityTest do
test "returns the activity that created an object" do
activity = insert(:note_activity)
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
assert activity == found_activity
end