projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Formatting.
[akkoma]
/
test
/
web
/
ostatus
/
ostatus_controller_test.exs
diff --git
a/test/web/ostatus/ostatus_controller_test.exs
b/test/web/ostatus/ostatus_controller_test.exs
index 20d17d41f1cd4e1b58a147b49df67b337b138987..ba885509358787988b5e325e449324922b3d7855 100644
(file)
--- a/
test/web/ostatus/ostatus_controller_test.exs
+++ b/
test/web/ostatus/ostatus_controller_test.exs
@@
-7,9
+7,11
@@
defmodule Pleroma.Web.OStatus.OStatusControllerTest do
test "decodes a salmon", %{conn: conn} do
user = insert(:user)
salmon = File.read!("test/fixtures/salmon.xml")
test "decodes a salmon", %{conn: conn} do
user = insert(:user)
salmon = File.read!("test/fixtures/salmon.xml")
- conn = conn
- |> put_req_header("content-type", "application/atom+xml")
- |> post("/users/#{user.nickname}/salmon", salmon)
+
+ conn =
+ conn
+ |> put_req_header("content-type", "application/atom+xml")
+ |> post("/users/#{user.nickname}/salmon", salmon)
assert response(conn, 200)
end
assert response(conn, 200)
end
@@
-17,21
+19,30
@@
defmodule Pleroma.Web.OStatus.OStatusControllerTest do
test "decodes a salmon with a changed magic key", %{conn: conn} do
user = insert(:user)
salmon = File.read!("test/fixtures/salmon.xml")
test "decodes a salmon with a changed magic key", %{conn: conn} do
user = insert(:user)
salmon = File.read!("test/fixtures/salmon.xml")
- conn = conn
- |> put_req_header("content-type", "application/atom+xml")
- |> post("/users/#{user.nickname}/salmon", salmon)
+
+ conn =
+ conn
+ |> put_req_header("content-type", "application/atom+xml")
+ |> post("/users/#{user.nickname}/salmon", salmon)
assert response(conn, 200)
# Set a wrong magic-key for a user so it has to refetch
salmon_user = User.get_by_ap_id("http://gs.example.org:4040/index.php/user/1")
assert response(conn, 200)
# Set a wrong magic-key for a user so it has to refetch
salmon_user = User.get_by_ap_id("http://gs.example.org:4040/index.php/user/1")
- info = salmon_user.info
- |> Map.put("magic_key", "RSA.pu0s-halox4tu7wmES1FVSx6u-4wc0YrUFXcqWXZG4-27UmbCOpMQftRCldNRfyA-qLbz-eqiwrong1EwUvjsD4cYbAHNGHwTvDOyx5AKthQUP44ykPv7kjKGh3DWKySJvcs9tlUG87hlo7AvnMo9pwRS_Zz2CacQ-MKaXyDepk=.AQAB") # Wrong key
+ # Wrong key
+ info =
+ salmon_user.info
+ |> Map.put(
+ "magic_key",
+ "RSA.pu0s-halox4tu7wmES1FVSx6u-4wc0YrUFXcqWXZG4-27UmbCOpMQftRCldNRfyA-qLbz-eqiwrong1EwUvjsD4cYbAHNGHwTvDOyx5AKthQUP44ykPv7kjKGh3DWKySJvcs9tlUG87hlo7AvnMo9pwRS_Zz2CacQ-MKaXyDepk=.AQAB"
+ )
+
Repo.update(User.info_changeset(salmon_user, %{info: info}))
Repo.update(User.info_changeset(salmon_user, %{info: info}))
- conn = build_conn()
- |> put_req_header("content-type", "application/atom+xml")
- |> post("/users/#{user.nickname}/salmon", salmon)
+ conn =
+ build_conn()
+ |> put_req_header("content-type", "application/atom+xml")
+ |> post("/users/#{user.nickname}/salmon", salmon)
assert response(conn, 200)
end
assert response(conn, 200)
end
@@
-40,44
+51,52
@@
defmodule Pleroma.Web.OStatus.OStatusControllerTest do
note_activity = insert(:note_activity)
user = User.get_cached_by_ap_id(note_activity.data["actor"])
note_activity = insert(:note_activity)
user = User.get_cached_by_ap_id(note_activity.data["actor"])
- conn = conn
- |> get("/users/#{user.nickname}/feed.atom")
+ conn =
+ conn
+ |> get("/users/#{user.nickname}/feed.atom")
- assert response(conn, 200)
+ assert response(conn, 200)
=~ note_activity.data["object"]["content"]
end
test "gets an object", %{conn: conn} do
note_activity = insert(:note_activity)
user = User.get_by_ap_id(note_activity.data["actor"])
end
test "gets an object", %{conn: conn} do
note_activity = insert(:note_activity)
user = User.get_by_ap_id(note_activity.data["actor"])
- [_, uuid] = hd
Regex.scan(~r/.+\/([\w-]+)$/, note_activity.data["object"]["id"]
)
+ [_, uuid] = hd
(Regex.scan(~r/.+\/([\w-]+)$/, note_activity.data["object"]["id"])
)
url = "/objects/#{uuid}"
url = "/objects/#{uuid}"
- conn = conn
- |> get(url)
+ conn =
+ conn
+ |> get(url)
- expected = ActivityRepresenter.to_simple_form(note_activity, user, true)
- |> ActivityRepresenter.wrap_with_entry
- |> :xmerl.export_simple(:xmerl_xml)
- |> to_string
+ expected =
+ ActivityRepresenter.to_simple_form(note_activity, user, true)
+ |> ActivityRepresenter.wrap_with_entry()
+ |> :xmerl.export_simple(:xmerl_xml)
+ |> to_string
assert response(conn, 200) == expected
end
test "gets an activity", %{conn: conn} do
note_activity = insert(:note_activity)
assert response(conn, 200) == expected
end
test "gets an activity", %{conn: conn} do
note_activity = insert(:note_activity)
- [_, uuid] = hd
Regex.scan(~r/.+\/([\w-]+)$/, note_activity.data["id"]
)
+ [_, uuid] = hd
(Regex.scan(~r/.+\/([\w-]+)$/, note_activity.data["id"])
)
url = "/activities/#{uuid}"
url = "/activities/#{uuid}"
- conn = conn
- |> get(url)
+ conn =
+ conn
+ |> get(url)
assert response(conn, 200)
end
assert response(conn, 200)
end
-end
-defmodule Pleroma.Web.OStatusMock do
- import Pleroma.Factory
- def handle_incoming(_doc) do
- insert(:note_activity)
+ test "gets a notice", %{conn: conn} do
+ note_activity = insert(:note_activity)
+ url = "/notice/#{note_activity.id}"
+
+ conn =
+ conn
+ |> get(url)
+
+ assert response(conn, 200)
end
end
end
end