projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into bugfix/web-notification-special-char
[akkoma]
/
test
/
web
/
ostatus
/
activity_representer_test.exs
diff --git
a/test/web/ostatus/activity_representer_test.exs
b/test/web/ostatus/activity_representer_test.exs
index a351510d85aa736384423c6f30a608ee3b262934..a4bb68c4d9722aa82428b4770227160a34e33b56 100644
(file)
--- a/
test/web/ostatus/activity_representer_test.exs
+++ b/
test/web/ostatus/activity_representer_test.exs
@@
-1,10
+1,16
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
use Pleroma.DataCase
defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
use Pleroma.DataCase
- alias Pleroma.Web.OStatus.ActivityRepresenter
- alias Pleroma.{User, Activity, Object}
+ alias Pleroma.Activity
+ alias Pleroma.Object
+ alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.OStatus
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.OStatus
+ alias Pleroma.Web.OStatus.ActivityRepresenter
import Pleroma.Factory
import Tesla.Mock
import Pleroma.Factory
import Tesla.Mock
@@
-110,10
+116,10
@@
defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
{:ok, announce, _object} = ActivityPub.announce(user, object)
{:ok, announce, _object} = ActivityPub.announce(user, object)
- announce =
Repo.get(Activity,
announce.id)
+ announce =
Activity.get_by_id(
announce.id)
note_user = User.get_cached_by_ap_id(note.data["actor"])
note_user = User.get_cached_by_ap_id(note.data["actor"])
- note =
Repo.get(Activity,
note.id)
+ note =
Activity.get_by_id(
note.id)
note_xml =
ActivityRepresenter.to_simple_form(note, note_user, true)
note_xml =
ActivityRepresenter.to_simple_form(note, note_user, true)