From: rinpatch <rinpatch@sdf.org>
Date: Mon, 3 Jun 2019 08:14:52 +0000 (+0300)
Subject: Merge branch 'develop' into feature/polls-2-electric-boogalo
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=026b245dbc2900d90a737f024b87453bf552b62b;p=akkoma

Merge branch 'develop' into feature/polls-2-electric-boogalo
---

026b245dbc2900d90a737f024b87453bf552b62b
diff --cc test/web/activity_pub/transmogrifier_test.exs
index 80832d1d8,bcc460f1c..89c8f79c9
--- a/test/web/activity_pub/transmogrifier_test.exs
+++ b/test/web/activity_pub/transmogrifier_test.exs
@@@ -1259,34 -1210,13 +1259,37 @@@ defmodule Pleroma.Web.ActivityPub.Trans
      end
    end
  
 +  test "Rewrites Answers to Notes" do
 +    user = insert(:user)
 +
 +    {:ok, poll_activity} =
 +      CommonAPI.post(user, %{
 +        "status" => "suya...",
 +        "poll" => %{"options" => ["suya", "suya.", "suya.."], "expires_in" => 10}
 +      })
 +
 +    poll_object = Object.normalize(poll_activity)
 +    # TODO: Replace with CommonAPI vote creation when implemented
 +    data =
 +      File.read!("test/fixtures/mastodon-vote.json")
 +      |> Poison.decode!()
 +      |> Kernel.put_in(["to"], user.ap_id)
 +      |> Kernel.put_in(["object", "inReplyTo"], poll_object.data["id"])
 +      |> Kernel.put_in(["object", "to"], user.ap_id)
 +
 +    {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
 +    {:ok, data} = Transmogrifier.prepare_outgoing(activity.data)
 +
 +    assert data["object"]["type"] == "Note"
 +  end
 +
    describe "fix_explicit_addressing" do
-     test "moves non-explicitly mentioned actors to cc" do
+     setup do
        user = insert(:user)
+       [user: user]
+     end
  
+     test "moves non-explicitly mentioned actors to cc", %{user: user} do
        explicitly_mentioned_actors = [
          "https://pleroma.gold/users/user1",
          "https://pleroma.gold/user2"