X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fostatus%2Fostatus_controller_test.exs;h=ba885509358787988b5e325e449324922b3d7855;hb=0a6c897c9488b26273a5fbb2de1ae1bfa0c96675;hp=8b7ca4d8933dcbbe5191ebf6d98672a79a7637a8;hpb=c48c381e909240dcece9f961e4728fa712d089cc;p=akkoma

diff --git a/test/web/ostatus/ostatus_controller_test.exs b/test/web/ostatus/ostatus_controller_test.exs
index 8b7ca4d89..ba8855093 100644
--- a/test/web/ostatus/ostatus_controller_test.exs
+++ b/test/web/ostatus/ostatus_controller_test.exs
@@ -1,25 +1,101 @@
 defmodule Pleroma.Web.OStatus.OStatusControllerTest do
   use Pleroma.Web.ConnCase
   import Pleroma.Factory
-  alias Pleroma.User
+  alias Pleroma.{User, Repo}
+  alias Pleroma.Web.OStatus.ActivityRepresenter
+
+  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)
+
+    assert response(conn, 200)
+  end
+
+  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)
+
+    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")
+    # 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}))
+
+    conn =
+      build_conn()
+      |> put_req_header("content-type", "application/atom+xml")
+      |> post("/users/#{user.nickname}/salmon", salmon)
+
+    assert response(conn, 200)
+  end
 
   test "gets a feed", %{conn: conn} do
     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)
-    [_, uuid] = hd Regex.scan(~r/.+\/([\w-]+)$/, note_activity.data["object"]["id"])
+    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)
+    conn =
+      conn
+      |> get(url)
+
+    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)
+    [_, uuid] = hd(Regex.scan(~r/.+\/([\w-]+)$/, note_activity.data["id"]))
+    url = "/activities/#{uuid}"
+
+    conn =
+      conn
+      |> get(url)
+
+    assert response(conn, 200)
+  end
+
+  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