Merge branch 'release/2.2.0' into 'stable'v2.2.0

Release/2.2.0

See merge request pleroma/secteam/pleroma!19

4 files changed, 0 insertions, 151 deletions

diff --git a/test/user/notification_setting_test.exs b/test/user/notification_setting_test.exs
deleted file mode 100644
index 308da216a..000000000
--- a/test/user/notification_setting_test.exs
+++ /dev/null
@@ -1,21 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.User.NotificationSettingTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.User.NotificationSetting
-
-  describe "changeset/2" do
-    test "sets option to hide notification contents" do
-      changeset =
-        NotificationSetting.changeset(
-          %NotificationSetting{},
-          %{"hide_notification_contents" => true}
-        )
-
-      assert %Ecto.Changeset{valid?: true} = changeset
-    end
-  end
-end
diff --git a/test/user/welcome_chat_massage_test.exs b/test/user/welcome_chat_massage_test.exs
deleted file mode 100644
index fe26d6e4d..000000000
--- a/test/user/welcome_chat_massage_test.exs
+++ /dev/null
@@ -1,35 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.User.WelcomeChatMessageTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.Config
-  alias Pleroma.User.WelcomeChatMessage
-
-  import Pleroma.Factory
-
-  setup do: clear_config([:welcome])
-
-  describe "post_message/1" do
-    test "send a chat welcome message" do
-      welcome_user = insert(:user, name: "mewmew")
-      user = insert(:user)
-
-      Config.put([:welcome, :chat_message, :enabled], true)
-      Config.put([:welcome, :chat_message, :sender_nickname], welcome_user.nickname)
-
-      Config.put(
-        [:welcome, :chat_message, :message],
-        "Hello, welcome to Blob/Cat!"
-      )
-
-      {:ok, %Pleroma.Activity{} = activity} = WelcomeChatMessage.post_message(user)
-
-      assert user.ap_id in activity.recipients
-      assert Pleroma.Object.normalize(activity).data["type"] == "ChatMessage"
-      assert Pleroma.Object.normalize(activity).data["content"] == "Hello, welcome to Blob/Cat!"
-    end
-  end
-end
diff --git a/test/user/welcome_email_test.exs b/test/user/welcome_email_test.exs
deleted file mode 100644
index d005d11b2..000000000
--- a/test/user/welcome_email_test.exs
+++ /dev/null
@@ -1,61 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.User.WelcomeEmailTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.Config
-  alias Pleroma.Tests.ObanHelpers
-  alias Pleroma.User.WelcomeEmail
-
-  import Pleroma.Factory
-  import Swoosh.TestAssertions
-
-  setup do: clear_config([:welcome])
-
-  describe "send_email/1" do
-    test "send a welcome email" do
-      user = insert(:user, name: "Jimm")
-
-      Config.put([:welcome, :email, :enabled], true)
-      Config.put([:welcome, :email, :sender], "welcome@pleroma.app")
-
-      Config.put(
-        [:welcome, :email, :subject],
-        "Hello, welcome to pleroma: <%= instance_name %>"
-      )
-
-      Config.put(
-        [:welcome, :email, :html],
-        "<h1>Hello <%= user.name %>.</h1> <p>Welcome to <%= instance_name %></p>"
-      )
-
-      instance_name = Config.get([:instance, :name])
-
-      {:ok, _job} = WelcomeEmail.send_email(user)
-
-      ObanHelpers.perform_all()
-
-      assert_email_sent(
-        from: {instance_name, "welcome@pleroma.app"},
-        to: {user.name, user.email},
-        subject: "Hello, welcome to pleroma: #{instance_name}",
-        html_body: "<h1>Hello #{user.name}.</h1> <p>Welcome to #{instance_name}</p>"
-      )
-
-      Config.put([:welcome, :email, :sender], {"Pleroma App", "welcome@pleroma.app"})
-
-      {:ok, _job} = WelcomeEmail.send_email(user)
-
-      ObanHelpers.perform_all()
-
-      assert_email_sent(
-        from: {"Pleroma App", "welcome@pleroma.app"},
-        to: {user.name, user.email},
-        subject: "Hello, welcome to pleroma: #{instance_name}",
-        html_body: "<h1>Hello #{user.name}.</h1> <p>Welcome to #{instance_name}</p>"
-      )
-    end
-  end
-end
diff --git a/test/user/welcome_message_test.exs b/test/user/welcome_message_test.exs
deleted file mode 100644
index 3cd6f5cb7..000000000
--- a/test/user/welcome_message_test.exs
+++ /dev/null
@@ -1,34 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.User.WelcomeMessageTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.Config
-  alias Pleroma.User.WelcomeMessage
-
-  import Pleroma.Factory
-
-  setup do: clear_config([:welcome])
-
-  describe "post_message/1" do
-    test "send a direct welcome message" do
-      welcome_user = insert(:user)
-      user = insert(:user, name: "Jimm")
-
-      Config.put([:welcome, :direct_message, :enabled], true)
-      Config.put([:welcome, :direct_message, :sender_nickname], welcome_user.nickname)
-
-      Config.put(
-        [:welcome, :direct_message, :message],
-        "Hello. Welcome to Pleroma"
-      )
-
-      {:ok, %Pleroma.Activity{} = activity} = WelcomeMessage.post_message(user)
-      assert user.ap_id in activity.recipients
-      assert activity.data["directMessage"] == true
-      assert Pleroma.Object.normalize(activity).data["content"] =~ "Hello. Welcome to Pleroma"
-    end
-  end
-end