projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Consistent style
[akkoma]
/
test
/
pleroma
/
web
/
o_status
/
o_status_controller_test.exs
diff --git
a/test/pleroma/web/o_status/o_status_controller_test.exs
b/test/pleroma/web/o_status/o_status_controller_test.exs
index 65b2c22dbe45bb16ac9a5335f5a3f5ae8675603d..f21180a89d12283884c05e80b2f9b04bb7a650a7 100644
(file)
--- a/
test/pleroma/web/o_status/o_status_controller_test.exs
+++ b/
test/pleroma/web/o_status/o_status_controller_test.exs
@@
-72,7
+72,7
@@
defmodule Pleroma.Web.OStatus.OStatusControllerTest do
test "redirects to /notice/id for html format", %{conn: conn} do
note_activity = insert(:note_activity)
test "redirects to /notice/id for html format", %{conn: conn} do
note_activity = insert(:note_activity)
- object = Object.normalize(note_activity)
+ object = Object.normalize(note_activity
, fetch: false
)
[_, uuid] = hd(Regex.scan(~r/.+\/([\w-]+)$/, object.data["id"]))
url = "/objects/#{uuid}"
[_, uuid] = hd(Regex.scan(~r/.+\/([\w-]+)$/, object.data["id"]))
url = "/objects/#{uuid}"
@@
-82,7
+82,7
@@
defmodule Pleroma.Web.OStatus.OStatusControllerTest do
test "404s on private objects", %{conn: conn} do
note_activity = insert(:direct_note_activity)
test "404s on private objects", %{conn: conn} do
note_activity = insert(:direct_note_activity)
- object = Object.normalize(note_activity)
+ object = Object.normalize(note_activity
, fetch: false
)
[_, uuid] = hd(Regex.scan(~r/.+\/([\w-]+)$/, object.data["id"]))
conn
[_, uuid] = hd(Regex.scan(~r/.+\/([\w-]+)$/, object.data["id"]))
conn
@@
-133,7
+133,7
@@
defmodule Pleroma.Web.OStatus.OStatusControllerTest do
conn: conn
} do
note_activity = insert(:note_activity)
conn: conn
} do
note_activity = insert(:note_activity)
- expected_redirect_url = Object.normalize(note_activity).data["id"]
+ expected_redirect_url = Object.normalize(note_activity
, fetch: false
).data["id"]
redirect_url =
conn
redirect_url =
conn
@@
-230,7
+230,7
@@
defmodule Pleroma.Web.OStatus.OStatusControllerTest do
describe "GET /notice/:id/embed_player" do
setup do
note_activity = insert(:note_activity)
describe "GET /notice/:id/embed_player" do
setup do
note_activity = insert(:note_activity)
- object = Pleroma.Object.normalize(note_activity)
+ object = Pleroma.Object.normalize(note_activity
, fetch: false
)
object_data =
Map.put(object.data, "attachment", [
object_data =
Map.put(object.data, "attachment", [
@@
-287,7
+287,7
@@
defmodule Pleroma.Web.OStatus.OStatusControllerTest do
test "404s when attachment is empty", %{conn: conn} do
note_activity = insert(:note_activity)
test "404s when attachment is empty", %{conn: conn} do
note_activity = insert(:note_activity)
- object = Pleroma.Object.normalize(note_activity)
+ object = Pleroma.Object.normalize(note_activity
, fetch: false
)
object_data = Map.put(object.data, "attachment", [])
object
object_data = Map.put(object.data, "attachment", [])
object
@@
-301,7
+301,7
@@
defmodule Pleroma.Web.OStatus.OStatusControllerTest do
test "404s when attachment isn't audio or video", %{conn: conn} do
note_activity = insert(:note_activity)
test "404s when attachment isn't audio or video", %{conn: conn} do
note_activity = insert(:note_activity)
- object = Pleroma.Object.normalize(note_activity)
+ object = Pleroma.Object.normalize(note_activity
, fetch: false
)
object_data =
Map.put(object.data, "attachment", [
object_data =
Map.put(object.data, "attachment", [