diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-17 22:53:26 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-17 22:53:26 +0300 |
| commit | 01c1078015c1ddbaa195125034489a14233df206 (patch) | |
| tree | 01c63b7d6a8040decf6e0cd1630b715ca2cb29c6 /test/web/twitter_api/twitter_api_test.exs | |
| parent | 76068873dbf9da191dd2487158ca88df198b811a (diff) | |
| parent | 79376abae347a5039931f57c581074b6da859827 (diff) | |
| download | pleroma-01c1078015c1ddbaa195125034489a14233df206.tar.gz pleroma-01c1078015c1ddbaa195125034489a14233df206.zip | |
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
Diffstat (limited to 'test/web/twitter_api/twitter_api_test.exs')
| -rw-r--r-- | test/web/twitter_api/twitter_api_test.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs index c5b18234e..3c0528776 100644 --- a/test/web/twitter_api/twitter_api_test.exs +++ b/test/web/twitter_api/twitter_api_test.exs @@ -5,6 +5,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do use Pleroma.DataCase alias Pleroma.Repo + alias Pleroma.Tests.ObanHelpers alias Pleroma.User alias Pleroma.UserInviteToken alias Pleroma.Web.MastodonAPI.AccountView @@ -68,6 +69,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do } {:ok, user} = TwitterAPI.register_user(data) + ObanHelpers.perform_all() assert user.info.confirmation_pending |