3 files changed, 72 insertions, 9 deletions
diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs
new file mode 100644
index 000000000..b34d3b787
--- /dev/null
+++ b/test/web/twitter_api/representers/activity_representer_test.exs
@@ -0,0 +1,39 @@
+defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
+  use Pleroma.DataCase
+  alias Pleroma.{User, Activity}
+  alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter}
+  alias Pleroma.Builders.UserBuilder
+
+  test "an activity" do
+    {:ok, user} = UserBuilder.insert
+    content = "Some content"
+    activity = %Activity{
+      id: 1,
+      data: %{
+        "type" => "Create",
+        "to" => [
+          User.ap_followers(user),
+          "https://www.w3.org/ns/activitystreams#Public"
+        ],
+        "actor" => User.ap_id(user),
+        "object" => %{
+          "type" => "Note",
+          "content" => content
+        }
+      }
+    }
+
+
+    expected_status = %{
+      "id" => activity.id,
+      "user" => UserRepresenter.to_map(user),
+      "is_local" => true,
+      "attentions" => [],
+      "statusnet_html" => content,
+      "text" => content,
+      "is_post_verb" => true
+    }
+
+    assert ActivityRepresenter.to_map(activity, %{user: user}) == expected_status
+  end
+end
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index 118ef932d..81f1e893e 100644
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -1,7 +1,7 @@
 defmodule Pleroma.Web.TwitterAPI.ControllerTest do
   use Pleroma.Web.ConnCase
-  alias Pleroma.{User, Repo}
   alias Pleroma.Web.TwitterAPI.Representers.UserRepresenter
+  alias Pleroma.Builders.UserBuilder
 
   describe "POST /api/account/verify_credentials" do
     setup [:valid_user]
@@ -20,14 +20,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
   end
 
   defp valid_user(_context) do
-    user = %User{
-      email: "test@example.org",
-      name: "Test Name",
-      nickname: "testname",
-      password_hash: Comeonin.Pbkdf2.hashpwsalt("test"),
-      bio: "A tester."
-    }
-    user = Repo.insert!(user)
+    { :ok, user } = UserBuilder.insert
     [user: user]
   end
 
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
new file mode 100644
index 000000000..aecf09969
--- /dev/null
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -0,0 +1,31 @@
+defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
+  use Pleroma.DataCase
+  alias Pleroma.Builders.{UserBuilder, ActivityBuilder}
+  alias Pleroma.Web.TwitterAPI.TwitterAPI
+  alias Pleroma.{Activity, User}
+  alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter}
+  alias Pleroma.Web.ActivityPub.ActivityPub
+
+  test "create a status" do
+    user = UserBuilder.build
+    input = %{
+      status: "Hello again."
+    }
+
+    { :ok, activity = %Activity{} } = TwitterAPI.create_status(user, input)
+
+    assert get_in(activity.data, [:object, :content]) == "Hello again."
+    assert get_in(activity.data, [:object, :type]) == "Note"
+    assert get_in(activity.data, [:actor]) == User.ap_id(user)
+    assert Enum.member?(get_in(activity.data, [:to]), User.ap_followers(user))
+    assert Enum.member?(get_in(activity.data, [:to]), "https://www.w3.org/ns/activitystreams#Public")
+  end
+
+  test "fetch public activities" do
+    %{ public: activity, user: user } = ActivityBuilder.public_and_non_public
+    statuses = TwitterAPI.fetch_public_statuses()
+
+    assert length(statuses) == 1
+    assert Enum.at(statuses, 0) == ActivityRepresenter.to_map(activity, %{user: user})
+  end
+end