X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=test%2Fpleroma%2Fuser%2Fimport_test.exs;h=19d022529412525f2288771c07ffd22b91eedbfe;hb=2d019e14e386fdd3391bb6d0bf36348dad78b075;hp=e198cdc0862ac37927dd49f20e549fb53b888930;hpb=80891e83d8df25b742a321d2c837e38c805e6582;p=akkoma
diff --git a/test/pleroma/user/import_test.exs b/test/pleroma/user/import_test.exs
index e198cdc08..19d022529 100644
--- a/test/pleroma/user/import_test.exs
+++ b/test/pleroma/user/import_test.exs
@@ -1,9 +1,8 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors
+# Copyright © 2017-2021 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.User.ImportTest do
- alias Pleroma.Repo
alias Pleroma.Tests.ObanHelpers
alias Pleroma.User
@@ -26,11 +25,14 @@ defmodule Pleroma.User.ImportTest do
user3.nickname
]
- {:ok, job} = User.Import.follow_import(user1, identifiers)
+ [{:ok, job1}, {:ok, job2}] = User.Import.follow_import(user1, identifiers)
+
+ assert {:ok, result} = ObanHelpers.perform(job1)
+ assert result == refresh_record(user2)
+
+ assert {:ok, result} = ObanHelpers.perform(job2)
+ assert result == refresh_record(user3)
- assert {:ok, result} = ObanHelpers.perform(job)
- assert is_list(result)
- assert result == [refresh_record(user2), refresh_record(user3)]
assert User.following?(user1, user2)
assert User.following?(user1, user3)
end
@@ -45,11 +47,14 @@ defmodule Pleroma.User.ImportTest do
user3.nickname
]
- {:ok, job} = User.Import.blocks_import(user1, identifiers)
+ [{:ok, job1}, {:ok, job2}] = User.Import.blocks_import(user1, identifiers)
+
+ assert {:ok, result} = ObanHelpers.perform(job1)
+ assert result == user2
+
+ assert {:ok, result} = ObanHelpers.perform(job2)
+ assert result == user3
- assert {:ok, result} = ObanHelpers.perform(job)
- assert is_list(result)
- assert result == [user2, user3]
assert User.blocks?(user1, user2)
assert User.blocks?(user1, user3)
end
@@ -64,11 +69,14 @@ defmodule Pleroma.User.ImportTest do
user3.nickname
]
- {:ok, job} = User.Import.mutes_import(user1, identifiers)
+ [{:ok, job1}, {:ok, job2}] = User.Import.mutes_import(user1, identifiers)
+
+ assert {:ok, result} = ObanHelpers.perform(job1)
+ assert result == user2
+
+ assert {:ok, result} = ObanHelpers.perform(job2)
+ assert result == user3
- assert {:ok, result} = ObanHelpers.perform(job)
- assert is_list(result)
- assert result == [user2, user3]
assert User.mutes?(user1, user2)
assert User.mutes?(user1, user3)
end