projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'remove-user-activities' into 'develop'
[akkoma]
/
test
/
web
/
twitter_api
/
views
/
user_view_test.exs
diff --git
a/test/web/twitter_api/views/user_view_test.exs
b/test/web/twitter_api/views/user_view_test.exs
index 95e52ca46a988d7fea21a72f53af9dd44ae5deff..0feaf4b64837ab032214cf33c08fbf383c72f1d6 100644
(file)
--- a/
test/web/twitter_api/views/user_view_test.exs
+++ b/
test/web/twitter_api/views/user_view_test.exs
@@
-6,8
+6,8
@@
defmodule Pleroma.Web.TwitterAPI.UserViewTest do
use Pleroma.DataCase
alias Pleroma.User
use Pleroma.DataCase
alias Pleroma.User
- alias Pleroma.Web.TwitterAPI.UserView
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.CommonAPI.Utils
+ alias Pleroma.Web.TwitterAPI.UserView
import Pleroma.Factory
import Pleroma.Factory
@@
-239,6
+239,13
@@
defmodule Pleroma.Web.TwitterAPI.UserViewTest do
assert represented["role"] == nil
end
assert represented["role"] == nil
end
+ test "A regular user for the admin", %{user: user} do
+ admin = insert(:user, %{info: %{is_admin: true}})
+ represented = UserView.render("show.json", %{user: user, for: admin})
+
+ assert represented["pleroma"]["deactivated"] == false
+ end
+
test "A blocked user for the blocker" do
user = insert(:user)
blocker = insert(:user)
test "A blocked user for the blocker" do
user = insert(:user)
blocker = insert(:user)
@@
-285,7
+292,7
@@
defmodule Pleroma.Web.TwitterAPI.UserViewTest do
}
}
}
}
- blocker =
Repo.get(User,
blocker.id)
+ blocker =
User.get_by_id(
blocker.id)
assert represented == UserView.render("show.json", %{user: user, for: blocker})
end
assert represented == UserView.render("show.json", %{user: user, for: blocker})
end