projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
[akkoma]
/
test
/
pleroma
/
web
/
mastodon_api
/
mastodon_api_test.exs
diff --git
a/test/pleroma/web/mastodon_api/mastodon_api_test.exs
b/test/pleroma/web/mastodon_api/mastodon_api_test.exs
index cf7f464beafddab5bd6678d898d74773877260e5..402bfd76f53d824f2e36d79aa0682622a59125e8 100644
(file)
--- a/
test/pleroma/web/mastodon_api/mastodon_api_test.exs
+++ b/
test/pleroma/web/mastodon_api/mastodon_api_test.exs
@@
-1,5
+1,5
@@
# 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.MastodonAPI.MastodonAPITest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.MastodonAPITest do
@@
-16,7
+16,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPITest do
describe "follow/3" do
test "returns error when followed user is deactivated" do
follower = insert(:user)
describe "follow/3" do
test "returns error when followed user is deactivated" do
follower = insert(:user)
- user = insert(:user, local: true,
deactivated: tru
e)
+ user = insert(:user, local: true,
is_active: fals
e)
assert {:error, _error} = MastodonAPI.follow(follower, user)
end
assert {:error, _error} = MastodonAPI.follow(follower, user)
end