From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Wed, 14 Aug 2019 18:44:50 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=8778c16dac1789eeb6dd51524573163216200b5d;p=akkoma

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

8778c16dac1789eeb6dd51524573163216200b5d
diff --cc test/web/mastodon_api/mastodon_api_controller_test.exs
index be9ff2568,2febe8b3a..f18b58a1b
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@@ -3936,11 -3937,9 +3939,11 @@@ defmodule Pleroma.Web.MastodonAPI.Masto
        |> post("/api/v1/pleroma/accounts/confirmation_resend?email=#{user.email}")
        |> json_response(:no_content)
  
 +      ObanHelpers.perform_all()
 +
        email = Pleroma.Emails.UserEmail.account_confirmation_email(user)
-       notify_email = Pleroma.Config.get([:instance, :notify_email])
-       instance_name = Pleroma.Config.get([:instance, :name])
+       notify_email = Config.get([:instance, :notify_email])
+       instance_name = Config.get([:instance, :name])
  
        assert_email_sent(
          from: {instance_name, notify_email},