From 514c899275a32e6ef63305f9424c50344d41b12e Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Tue, 11 Feb 2020 10:12:57 +0300
Subject: adding gun adapter

---
 test/notification_test.exs | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'test/notification_test.exs')

diff --git a/test/notification_test.exs b/test/notification_test.exs
index 04bf5b41a..1de3c6e3b 100644
--- a/test/notification_test.exs
+++ b/test/notification_test.exs
@@ -649,6 +649,13 @@ defmodule Pleroma.NotificationTest do
         "object" => remote_user.ap_id
       }
 
+      remote_user_url = remote_user.ap_id
+
+      Tesla.Mock.mock(fn
+        %{method: :get, url: ^remote_user_url} ->
+          %Tesla.Env{status: 404, body: ""}
+      end)
+
       {:ok, _delete_activity} = Transmogrifier.handle_incoming(delete_user_message)
       ObanHelpers.perform_all()
 
-- 
cgit v1.2.3


From 7c0ed9302cb13ab44c1bf18017538315dcd0ce2e Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Tue, 3 Mar 2020 16:46:20 +0300
Subject: unnecessary mock

---
 test/notification_test.exs | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'test/notification_test.exs')

diff --git a/test/notification_test.exs b/test/notification_test.exs
index 1c60f6866..56a581810 100644
--- a/test/notification_test.exs
+++ b/test/notification_test.exs
@@ -649,13 +649,6 @@ defmodule Pleroma.NotificationTest do
         "object" => remote_user.ap_id
       }
 
-      remote_user_url = remote_user.ap_id
-
-      Tesla.Mock.mock(fn
-        %{method: :get, url: ^remote_user_url} ->
-          %Tesla.Env{status: 404, body: ""}
-      end)
-
       {:ok, _delete_activity} = Transmogrifier.handle_incoming(delete_user_message)
       ObanHelpers.perform_all()
 
-- 
cgit v1.2.3


From f0753eed0fdddd30e127213c89a118dd2e087dc9 Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Thu, 5 Mar 2020 17:31:06 +0300
Subject: removing try block in tesla request

added mocks for tests which fail with Tesla.Mock.Error
---
 test/notification_test.exs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'test/notification_test.exs')

diff --git a/test/notification_test.exs b/test/notification_test.exs
index 56a581810..c71df4e07 100644
--- a/test/notification_test.exs
+++ b/test/notification_test.exs
@@ -649,12 +649,20 @@ defmodule Pleroma.NotificationTest do
         "object" => remote_user.ap_id
       }
 
+      remote_user_url = remote_user.ap_id
+
+      Tesla.Mock.mock(fn
+        %{method: :get, url: ^remote_user_url} ->
+          %Tesla.Env{status: 404, body: ""}
+      end)
+
       {:ok, _delete_activity} = Transmogrifier.handle_incoming(delete_user_message)
       ObanHelpers.perform_all()
 
       assert Enum.empty?(Notification.for_user(local_user))
     end
 
+    @tag capture_log: true
     test "move activity generates a notification" do
       %{ap_id: old_ap_id} = old_user = insert(:user)
       %{ap_id: new_ap_id} = new_user = insert(:user, also_known_as: [old_ap_id])
@@ -664,6 +672,18 @@ defmodule Pleroma.NotificationTest do
       User.follow(follower, old_user)
       User.follow(other_follower, old_user)
 
+      old_user_url = old_user.ap_id
+
+      body =
+        File.read!("test/fixtures/users_mock/localhost.json")
+        |> String.replace("{{nickname}}", old_user.nickname)
+        |> Jason.encode!()
+
+      Tesla.Mock.mock(fn
+        %{method: :get, url: ^old_user_url} ->
+          %Tesla.Env{status: 200, body: body}
+      end)
+
       Pleroma.Web.ActivityPub.ActivityPub.move(old_user, new_user)
       ObanHelpers.perform_all()
 
-- 
cgit v1.2.3