projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'restore-twitter-api-tests' 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 c5b18234e092a7a7a6f335497d786411f2bbe457..85a9be3e087b6dd32a24ef96c55178f7f29f133c 100644
(file)
--- a/
test/web/twitter_api/twitter_api_test.exs
+++ b/
test/web/twitter_api/twitter_api_test.exs
@@
-1,10
+1,11
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-201
8
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-201
9
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
use Pleroma.DataCase
alias Pleroma.Repo
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
use Pleroma.DataCase
alias Pleroma.Repo
+ alias Pleroma.Tests.ObanHelpers
alias Pleroma.User
alias Pleroma.UserInviteToken
alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.User
alias Pleroma.UserInviteToken
alias Pleroma.Web.MastodonAPI.AccountView
@@
-28,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
@@
-46,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
@@
-68,8
+69,9
@@
defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
}
{:ok, user} = TwitterAPI.register_user(data)
}
{: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)
@@
-107,7
+109,9
@@
defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
{:ok, user2} = TwitterAPI.register_user(data2)
expected_text =
{:ok, user2} = TwitterAPI.register_user(data2)
expected_text =
- "<span class='h-card'><a data-user='#{user1.id}' class='u-url mention' href='#{user1.ap_id}'>@<span>john</span></a></span> test"
+ ~s(<span class="h-card"><a data-user="#{user1.id}" class="u-url mention" href="#{
+ user1.ap_id
+ }" rel="ugc">@<span>john</span></a></span> test)
assert user2.bio == expected_text
end
assert user2.bio == expected_text
end
@@
-144,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
@@
-209,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}
@@
-284,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",
@@
-335,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
@@
-359,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",