X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fostatus%2Fostatus_controller_test.exs;h=954abf5fe96559aaff1ecbd274d979465f679352;hb=c9b418e5477229017b3750c55cf3ea3d03b7e609;hp=411e89e943488bc8eb1cb3927f627e520b38b417;hpb=4944498133d4a945650201226808b1f09d355014;p=akkoma

diff --git a/test/web/ostatus/ostatus_controller_test.exs b/test/web/ostatus/ostatus_controller_test.exs
index 411e89e94..954abf5fe 100644
--- a/test/web/ostatus/ostatus_controller_test.exs
+++ b/test/web/ostatus/ostatus_controller_test.exs
@@ -1,7 +1,11 @@
+# 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.OStatusControllerTest do
   use Pleroma.Web.ConnCase
   import Pleroma.Factory
-  alias Pleroma.{User, Repo}
+  alias Pleroma.{User, Repo, Object}
   alias Pleroma.Web.CommonAPI
   alias Pleroma.Web.OStatus.ActivityRepresenter
 
@@ -42,10 +46,10 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do
           "RSA.pu0s-halox4tu7wmES1FVSx6u-4wc0YrUFXcqWXZG4-27UmbCOpMQftRCldNRfyA-qLbz-eqiwrong1EwUvjsD4cYbAHNGHwTvDOyx5AKthQUP44ykPv7kjKGh3DWKySJvcs9tlUG87hlo7AvnMo9pwRS_Zz2CacQ-MKaXyDepk=.AQAB"
       })
 
-    cng =
-      Ecto.Changeset.change(salmon_user)
-      |> Ecto.Changeset.put_embed(:info, info_cng)
-      |> Repo.update()
+    salmon_user
+    |> Ecto.Changeset.change()
+    |> Ecto.Changeset.put_embed(:info, info_cng)
+    |> Repo.update()
 
     conn =
       build_conn()
@@ -84,6 +88,7 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do
 
     conn =
       conn
+      |> put_req_header("accept", "application/xml")
       |> get(url)
 
     expected =
@@ -97,82 +102,77 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do
 
   test "404s on private objects", %{conn: conn} do
     note_activity = insert(:direct_note_activity)
-    user = User.get_by_ap_id(note_activity.data["actor"])
     [_, uuid] = hd(Regex.scan(~r/.+\/([\w-]+)$/, note_activity.data["object"]["id"]))
-    url = "/objects/#{uuid}"
-
-    conn =
-      conn
-      |> get(url)
 
-    assert response(conn, 404)
+    conn
+    |> get("/objects/#{uuid}")
+    |> response(404)
   end
 
   test "404s on nonexisting objects", %{conn: conn} do
-    url = "/objects/123"
+    conn
+    |> get("/objects/123")
+    |> response(404)
+  end
 
-    conn =
-      conn
-      |> get(url)
+  test "gets an activity in xml format", %{conn: conn} do
+    note_activity = insert(:note_activity)
+    [_, uuid] = hd(Regex.scan(~r/.+\/([\w-]+)$/, note_activity.data["id"]))
 
-    assert response(conn, 404)
+    conn
+    |> put_req_header("accept", "application/xml")
+    |> get("/activities/#{uuid}")
+    |> response(200)
   end
 
-  test "gets an activity", %{conn: conn} do
+  test "404s on deleted objects", %{conn: conn} do
     note_activity = insert(:note_activity)
-    [_, uuid] = hd(Regex.scan(~r/.+\/([\w-]+)$/, note_activity.data["id"]))
-    url = "/activities/#{uuid}"
+    [_, uuid] = hd(Regex.scan(~r/.+\/([\w-]+)$/, note_activity.data["object"]["id"]))
+    object = Object.get_by_ap_id(note_activity.data["object"]["id"])
 
-    conn =
-      conn
-      |> get(url)
+    conn
+    |> put_req_header("accept", "application/xml")
+    |> get("/objects/#{uuid}")
+    |> response(200)
 
-    assert response(conn, 200)
+    Object.delete(object)
+
+    conn
+    |> put_req_header("accept", "application/xml")
+    |> get("/objects/#{uuid}")
+    |> response(404)
   end
 
   test "404s on private activities", %{conn: conn} do
     note_activity = insert(:direct_note_activity)
     [_, uuid] = hd(Regex.scan(~r/.+\/([\w-]+)$/, note_activity.data["id"]))
-    url = "/activities/#{uuid}"
 
-    conn =
-      conn
-      |> get(url)
-
-    assert response(conn, 404)
+    conn
+    |> get("/activities/#{uuid}")
+    |> response(404)
   end
 
   test "404s on nonexistent activities", %{conn: conn} do
-    url = "/activities/123"
-
-    conn =
-      conn
-      |> get(url)
-
-    assert response(conn, 404)
+    conn
+    |> get("/activities/123")
+    |> response(404)
   end
 
-  test "gets a notice", %{conn: conn} do
+  test "gets a notice in xml format", %{conn: conn} do
     note_activity = insert(:note_activity)
-    url = "/notice/#{note_activity.id}"
 
-    conn =
-      conn
-      |> get(url)
-
-    assert response(conn, 200)
+    conn
+    |> get("/notice/#{note_activity.id}")
+    |> response(200)
   end
 
   test "gets a notice in AS2 format", %{conn: conn} do
     note_activity = insert(:note_activity)
-    url = "/notice/#{note_activity.id}"
 
-    conn =
-      conn
-      |> put_req_header("accept", "application/activity+json")
-      |> get(url)
-
-    assert json_response(conn, 200)
+    conn
+    |> put_req_header("accept", "application/activity+json")
+    |> get("/notice/#{note_activity.id}")
+    |> json_response(200)
   end
 
   test "only gets a notice in AS2 format for Create messages", %{conn: conn} do