From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Fri, 6 Sep 2019 10:26:05 +0000 (+0300)
Subject: [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=ca1ba1e272fd51ee1d9524a39da07b4b2f9e0b6e;p=akkoma

[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

# Conflicts:
#	test/web/twitter_api/twitter_api_controller_test.exs
---

ca1ba1e272fd51ee1d9524a39da07b4b2f9e0b6e
diff --cc test/web/twitter_api/twitter_api_test.exs
index bf063a0de,c5b18234e..3c0528776
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@@ -4,18 -4,11 +4,12 @@@
  
  defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
    use Pleroma.DataCase
-   alias Pleroma.Activity
-   alias Pleroma.Object
    alias Pleroma.Repo
 +  alias Pleroma.Tests.ObanHelpers
    alias Pleroma.User
    alias Pleroma.UserInviteToken
-   alias Pleroma.Web.ActivityPub.ActivityPub
-   alias Pleroma.Web.TwitterAPI.ActivityView
+   alias Pleroma.Web.MastodonAPI.AccountView
    alias Pleroma.Web.TwitterAPI.TwitterAPI
-   alias Pleroma.Web.TwitterAPI.UserView
- 
-   import Pleroma.Factory
  
    setup_all do
      Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)