Merge branch 'feature/788-separate-email-addresses' into 'develop'

Feature/788 separate email addresses

Closes #788

See merge request pleroma/pleroma!1040

test/web/twitter_api/twitter_api_test.exs

@@ -325,8 +325,15 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
 
     assert user.info.confirmation_pending
 
+    email = Pleroma.Emails.UserEmail.account_confirmation_email(user)
+
+    notify_email = Pleroma.Config.get([:instance, :notify_email])
+    instance_name = Pleroma.Config.get([:instance, :name])
+
     Swoosh.TestAssertions.assert_email_sent(
-      Pleroma.Emails.UserEmail.account_confirmation_email(user)
+      from: {instance_name, notify_email},
+      to: {user.name, user.email},
+      html_body: email.html_body
     )
   end