From 71cecb5b2c09ae9ab52993b165051443c2a72171 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Fri, 4 Jun 2021 13:08:05 +0200
Subject: [PATCH] Fix tests

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 config/test.exs                                      |  5 -----
 test/graphql/resolvers/activity_test.exs             |  5 -----
 test/service/workers/activity_builder_test.exs       | 12 +++++++++++-
 .../service/workers/legacy_notifier_builder_test.exs | 10 ++++++++++
 test/support/data_case.ex                            |  2 --
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/config/test.exs b/config/test.exs
index 271ad1b6c..4f024d17c 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -82,8 +82,3 @@ config :junit_formatter, report_dir: "."
 if System.get_env("DOCKER", "false") == "false" && File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
 end
-
-config :mobilizon, Mobilizon.Service.Notifier,
-  notifiers: [
-    Mobilizon.Service.Notifier.Mock
-  ]
diff --git a/test/graphql/resolvers/activity_test.exs b/test/graphql/resolvers/activity_test.exs
index 5b2053f61..3555f6fc0 100644
--- a/test/graphql/resolvers/activity_test.exs
+++ b/test/graphql/resolvers/activity_test.exs
@@ -14,11 +14,6 @@ defmodule Mobilizon.GraphQL.Resolvers.ActivityTest do
   setup %{conn: conn} do
     group = insert(:group)
 
-    Mobilizon.Config.put([Mobilizon.Service.Notifier, :notifiers], [
-      Mobilizon.Service.Notifier.Email,
-      Mobilizon.Service.Notifier.Push
-    ])
-
     {:ok, conn: conn, group: group}
   end
 
diff --git a/test/service/workers/activity_builder_test.exs b/test/service/workers/activity_builder_test.exs
index e73a9a687..480ddaa5f 100644
--- a/test/service/workers/activity_builder_test.exs
+++ b/test/service/workers/activity_builder_test.exs
@@ -5,7 +5,7 @@ defmodule Mobilizon.Service.Workers.ActivityBuilderTest do
 
   alias Mobilizon.Activities.Activity
   alias Mobilizon.Actors.Actor
-  alias Mobilizon.Service.Notifier.Mock, as: NotifierMock
+  alias Mobilizon.Service.Notifier.Mock2, as: NotifierMock
   alias Mobilizon.Service.Workers.ActivityBuilder
   alias Mobilizon.Users.User
 
@@ -14,6 +14,16 @@ defmodule Mobilizon.Service.Workers.ActivityBuilderTest do
   import Mobilizon.Factory
   import Mox
 
+  setup_all do
+    Mox.defmock(NotifierMock, for: Mobilizon.Service.Notifier)
+
+    Mobilizon.Config.put([Mobilizon.Service.Notifier, :notifiers], [
+      NotifierMock
+    ])
+
+    :ok
+  end
+
   setup :verify_on_exit!
 
   describe "Sends direct email notification to users" do
diff --git a/test/service/workers/legacy_notifier_builder_test.exs b/test/service/workers/legacy_notifier_builder_test.exs
index 35ae41ffe..e6ffb6d28 100644
--- a/test/service/workers/legacy_notifier_builder_test.exs
+++ b/test/service/workers/legacy_notifier_builder_test.exs
@@ -15,6 +15,16 @@ defmodule Mobilizon.Service.Workers.LegacyNotifierBuilderTest do
   import Mox
   import Mobilizon.Factory
 
+  setup_all do
+    Mox.defmock(Mobilizon.Service.Notifier.Mock, for: Mobilizon.Service.Notifier)
+
+    Mobilizon.Config.put([Mobilizon.Service.Notifier, :notifiers], [
+      Mobilizon.Service.Notifier.Mock
+    ])
+
+    :ok
+  end
+
   @mentionned %{
     "type" => "comment",
     "subject" => "event_comment_mention",
diff --git a/test/support/data_case.ex b/test/support/data_case.ex
index e8e6c05c0..0423a9777 100644
--- a/test/support/data_case.ex
+++ b/test/support/data_case.ex
@@ -79,6 +79,4 @@ defmodule Mobilizon.DataCase do
   Mox.defmock(Mobilizon.Service.HTTP.GeospatialClient.Mock,
     for: Tesla.Adapter
   )
-
-  Mox.defmock(Mobilizon.Service.Notifier.Mock, for: Mobilizon.Service.Notifier)
 end