projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request 'Spin off imports into n oban jobs' (#319) from spin-off-imports...
[akkoma]
/
test
/
pleroma
/
web
/
pleroma_api
/
controllers
/
user_import_controller_test.exs
diff --git
a/test/pleroma/web/pleroma_api/controllers/user_import_controller_test.exs
b/test/pleroma/web/pleroma_api/controllers/user_import_controller_test.exs
index 433c97e81dd932e0229bfac37a5b056af2d3a785..f9175058d01c28f70add7b0bc688f18a45d8d1ec 100644
(file)
--- a/
test/pleroma/web/pleroma_api/controllers/user_import_controller_test.exs
+++ b/
test/pleroma/web/pleroma_api/controllers/user_import_controller_test.exs
@@
-1,12
+1,11
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.PleromaAPI.UserImportControllerTest do
use Pleroma.Web.ConnCase
use Oban.Testing, repo: Pleroma.Repo
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.PleromaAPI.UserImportControllerTest do
use Pleroma.Web.ConnCase
use Oban.Testing, repo: Pleroma.Repo
- alias Pleroma.Config
alias Pleroma.Tests.ObanHelpers
import Pleroma.Factory
alias Pleroma.Tests.ObanHelpers
import Pleroma.Factory
@@
-48,7
+47,8
@@
defmodule Pleroma.Web.PleromaAPI.UserImportControllerTest do
|> json_response_and_validate_schema(200)
assert [{:ok, job_result}] = ObanHelpers.perform_all()
|> json_response_and_validate_schema(200)
assert [{:ok, job_result}] = ObanHelpers.perform_all()
- assert job_result == [user2]
+ assert job_result == refresh_record(user2)
+ assert %Pleroma.User{follower_count: 1} = job_result
end
end
end
end
@@
-83,7
+83,7
@@
defmodule Pleroma.Web.PleromaAPI.UserImportControllerTest do
assert %{"error" => "Insufficient permissions: follow | write:follows."} ==
json_response(conn, 403)
else
assert %{"error" => "Insufficient permissions: follow | write:follows."} ==
json_response(conn, 403)
else
- assert json_response(conn, 200)
+ assert json_response
_and_validate_schema
(conn, 200)
end
end
end
end
end
end
@@
-108,8
+108,8
@@
defmodule Pleroma.Web.PleromaAPI.UserImportControllerTest do
|> post("/api/pleroma/follow_import", %{"list" => identifiers})
|> json_response_and_validate_schema(200)
|> post("/api/pleroma/follow_import", %{"list" => identifiers})
|> json_response_and_validate_schema(200)
-
assert [{:ok, job_result}] = ObanHelpers.perform_all(
)
- assert job_result
== users
+
job_results = Enum.map(ObanHelpers.perform_all(), fn {:ok, result} -> result end
)
+ assert job_result
s == Enum.map(users, &refresh_record/1)
end
end
end
end
@@
-141,8
+141,8
@@
defmodule Pleroma.Web.PleromaAPI.UserImportControllerTest do
})
|> json_response_and_validate_schema(200)
})
|> json_response_and_validate_schema(200)
-
assert [{:ok, job_result}] = ObanHelpers.perform_all(
)
- assert job_result == users
+
job_results = Enum.map(ObanHelpers.perform_all(), fn {:ok, result} -> result end
)
+ assert job_result
s
== users
end
end
end
end
@@
-165,8
+165,8
@@
defmodule Pleroma.Web.PleromaAPI.UserImportControllerTest do
|> post("/api/pleroma/blocks_import", %{"list" => identifiers})
|> json_response_and_validate_schema(200)
|> post("/api/pleroma/blocks_import", %{"list" => identifiers})
|> json_response_and_validate_schema(200)
-
assert [{:ok, job_result}] = ObanHelpers.perform_all(
)
- assert job_result == users
+
job_results = Enum.map(ObanHelpers.perform_all(), fn {:ok, result} -> result end
)
+ assert job_result
s
== users
end
end
end
end
@@
-183,12
+183,12
@@
defmodule Pleroma.Web.PleromaAPI.UserImportControllerTest do
|> post("/api/pleroma/mutes_import", %{"list" => "#{user2.ap_id}"})
|> json_response_and_validate_schema(200)
|> post("/api/pleroma/mutes_import", %{"list" => "#{user2.ap_id}"})
|> json_response_and_validate_schema(200)
-
assert [{:ok, job_result}] = ObanHelpers.perform_all(
)
- assert job_result == [user2]
+
job_results = Enum.map(ObanHelpers.perform_all(), fn {:ok, result} -> result end
)
+ assert job_result
s
== [user2]
assert Pleroma.User.mutes?(user, user2)
end
assert Pleroma.User.mutes?(user, user2)
end
- test "it imports mute
s
users from file", %{user: user, conn: conn} do
+ test "it imports mute
d
users from file", %{user: user, conn: conn} do
users = [user2, user3] = insert_list(2, :user)
with_mocks([
users = [user2, user3] = insert_list(2, :user)
with_mocks([
@@
-202,8
+202,8
@@
defmodule Pleroma.Web.PleromaAPI.UserImportControllerTest do
})
|> json_response_and_validate_schema(200)
})
|> json_response_and_validate_schema(200)
-
assert [{:ok, job_result}] = ObanHelpers.perform_all(
)
- assert job_result == users
+
job_results = Enum.map(ObanHelpers.perform_all(), fn {:ok, result} -> result end
)
+ assert job_result
s
== users
assert Enum.all?(users, &Pleroma.User.mutes?(user, &1))
end
end
assert Enum.all?(users, &Pleroma.User.mutes?(user, &1))
end
end
@@
-227,8
+227,8
@@
defmodule Pleroma.Web.PleromaAPI.UserImportControllerTest do
|> post("/api/pleroma/mutes_import", %{"list" => identifiers})
|> json_response_and_validate_schema(200)
|> post("/api/pleroma/mutes_import", %{"list" => identifiers})
|> json_response_and_validate_schema(200)
-
assert [{:ok, job_result}] = ObanHelpers.perform_all(
)
- assert job_result == users
+
job_results = Enum.map(ObanHelpers.perform_all(), fn {:ok, result} -> result end
)
+ assert job_result
s
== users
assert Enum.all?(users, &Pleroma.User.mutes?(user, &1))
end
end
assert Enum.all?(users, &Pleroma.User.mutes?(user, &1))
end
end