projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'favoritng-responses' into 'develop'
[akkoma]
/
test
/
web
/
twitter_api
/
twitter_api_test.exs
diff --git
a/test/web/twitter_api/twitter_api_test.exs
b/test/web/twitter_api/twitter_api_test.exs
index bf1e233f5025d74572a45a6e9a39102c9629b570..85a9be3e087b6dd32a24ef96c55178f7f29f133c 100644
(file)
--- a/
test/web/twitter_api/twitter_api_test.exs
+++ b/
test/web/twitter_api/twitter_api_test.exs
@@
-29,8
+29,8
@@
defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
fetched_user = User.get_cached_by_nickname("lain")
fetched_user = User.get_cached_by_nickname("lain")
- assert AccountView.render("
account
.json", %{user: user}) ==
- AccountView.render("
account
.json", %{user: fetched_user})
+ assert AccountView.render("
show
.json", %{user: user}) ==
+ AccountView.render("
show
.json", %{user: fetched_user})
end
test "it registers a new user with empty string in bio and returns the user." do
end
test "it registers a new user with empty string in bio and returns the user." do
@@
-47,8
+47,8
@@
defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
fetched_user = User.get_cached_by_nickname("lain")
fetched_user = User.get_cached_by_nickname("lain")
- assert AccountView.render("
account
.json", %{user: user}) ==
- AccountView.render("
account
.json", %{user: fetched_user})
+ assert AccountView.render("
show
.json", %{user: user}) ==
+ AccountView.render("
show
.json", %{user: fetched_user})
end
test "it sends confirmation email if :account_activation_required is specified in instance config" do
end
test "it sends confirmation email if :account_activation_required is specified in instance config" do
@@
-71,7
+71,7
@@
defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
{:ok, user} = TwitterAPI.register_user(data)
ObanHelpers.perform_all()
{:ok, user} = TwitterAPI.register_user(data)
ObanHelpers.perform_all()
- assert user.
info.
confirmation_pending
+ assert user.confirmation_pending
email = Pleroma.Emails.UserEmail.account_confirmation_email(user)
email = Pleroma.Emails.UserEmail.account_confirmation_email(user)
@@
-148,8
+148,8
@@
defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
assert invite.used == true
assert invite.used == true
- assert AccountView.render("
account
.json", %{user: user}) ==
- AccountView.render("
account
.json", %{user: fetched_user})
+ assert AccountView.render("
show
.json", %{user: user}) ==
+ AccountView.render("
show
.json", %{user: fetched_user})
end
test "returns error on invalid token" do
end
test "returns error on invalid token" do
@@
-213,8
+213,8
@@
defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
{:ok, user} = TwitterAPI.register_user(data)
fetched_user = User.get_cached_by_nickname("vinny")
{:ok, user} = TwitterAPI.register_user(data)
fetched_user = User.get_cached_by_nickname("vinny")
- assert AccountView.render("
account
.json", %{user: user}) ==
- AccountView.render("
account
.json", %{user: fetched_user})
+ assert AccountView.render("
show
.json", %{user: user}) ==
+ AccountView.render("
show
.json", %{user: fetched_user})
end
{:ok, data: data, check_fn: check_fn}
end
{:ok, data: data, check_fn: check_fn}
@@
-288,8
+288,8
@@
defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
assert invite.used == true
assert invite.used == true
- assert AccountView.render("
account
.json", %{user: user}) ==
- AccountView.render("
account
.json", %{user: fetched_user})
+ assert AccountView.render("
show
.json", %{user: user}) ==
+ AccountView.render("
show
.json", %{user: fetched_user})
data = %{
"nickname" => "GrimReaper",
data = %{
"nickname" => "GrimReaper",
@@
-339,8
+339,8
@@
defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
refute invite.used
refute invite.used
- assert AccountView.render("
account
.json", %{user: user}) ==
- AccountView.render("
account
.json", %{user: fetched_user})
+ assert AccountView.render("
show
.json", %{user: user}) ==
+ AccountView.render("
show
.json", %{user: fetched_user})
end
test "error after max uses" do
end
test "error after max uses" do
@@
-363,8
+363,8
@@
defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
invite = Repo.get_by(UserInviteToken, token: invite.token)
assert invite.used == true
invite = Repo.get_by(UserInviteToken, token: invite.token)
assert invite.used == true
- assert AccountView.render("
account
.json", %{user: user}) ==
- AccountView.render("
account
.json", %{user: fetched_user})
+ assert AccountView.render("
show
.json", %{user: user}) ==
+ AccountView.render("
show
.json", %{user: fetched_user})
data = %{
"nickname" => "GrimReaper",
data = %{
"nickname" => "GrimReaper",