2 files changed, 40 insertions, 0 deletions
diff --git a/test/pleroma/user/email_list_test.exs b/test/pleroma/user/email_list_test.exs
index 8dbe877c5..162e21ff8 100644
--- a/test/pleroma/user/email_list_test.exs
+++ b/test/pleroma/user/email_list_test.exs
@@ -39,4 +39,21 @@ defmodule Pleroma.User.EmailListTest do
 
     assert EmailList.generate_csv(:unsubscribers) == expected
   end
+
+  test "generate_csv/1 with :combined" do
+    user1 = insert(:user, accepts_email_list: true)
+    user2 = insert(:user, accepts_email_list: false)
+    user3 = insert(:user, accepts_email_list: false)
+    user4 = insert(:user, accepts_email_list: true)
+
+    expected = """
+    Email Address,Nickname,Subscribe?\r
+    #{user1.email},#{user1.nickname},true\r
+    #{user2.email},#{user2.nickname},false\r
+    #{user3.email},#{user3.nickname},false\r
+    #{user4.email},#{user4.nickname},true\r
+    """
+
+    assert EmailList.generate_csv(:combined) == expected
+  end
 end
diff --git a/test/pleroma/web/admin_api/controllers/email_list_controller_test.exs b/test/pleroma/web/admin_api/controllers/email_list_controller_test.exs
index 4a9f52812..ed2592afd 100644
--- a/test/pleroma/web/admin_api/controllers/email_list_controller_test.exs
+++ b/test/pleroma/web/admin_api/controllers/email_list_controller_test.exs
@@ -76,4 +76,27 @@ defmodule Pleroma.Web.AdminAPI.EmailListControllerTest do
       |> response(403)
     end
   end
+
+  describe "GET /api/v1/pleroma/admin/email_list/combined.csv" do
+    setup do: admin_setup()
+
+    test "returns a CSV", %{conn: conn} do
+      result =
+        conn
+        |> get("/api/v1/pleroma/admin/email_list/combined.csv")
+        |> response(200)
+
+      assert result
+    end
+  end
+
+  describe "GET /api/v1/pleroma/admin/email_list/combined.csv unauthorized" do
+    setup do: user_setup()
+
+    test "returns 403", %{conn: conn} do
+      conn
+      |> get("/api/v1/pleroma/admin/email_list/combined.csv")
+      |> response(403)
+    end
+  end
 end