projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'issue/1023' into 'develop'
[akkoma]
/
test
/
web
/
mastodon_api
/
controllers
/
account_controller_test.exs
diff --git
a/test/web/mastodon_api/controllers/account_controller_test.exs
b/test/web/mastodon_api/controllers/account_controller_test.exs
index 1ba5bc964b2e427e539a4f1139ff1a995abaa6a2..e6b283aab390790074cb911678363b60f21038fa 100644
(file)
--- a/
test/web/mastodon_api/controllers/account_controller_test.exs
+++ b/
test/web/mastodon_api/controllers/account_controller_test.exs
@@
-1017,7
+1017,7
@@
defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
password: "PlzDontHackLain",
bio: "Test Bio",
agreement: true,
password: "PlzDontHackLain",
bio: "Test Bio",
agreement: true,
- reason: "I
a
m a cool dude, bro"
+ reason: "I
'
m a cool dude, bro"
})
%{
})
%{
@@
-1035,7
+1035,7
@@
defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
assert token_from_db.user.confirmation_pending
assert token_from_db.user.approval_pending
assert token_from_db.user.confirmation_pending
assert token_from_db.user.approval_pending
- assert token_from_db.user.registration_reason == "I
a
m a cool dude, bro"
+ assert token_from_db.user.registration_reason == "I
'
m a cool dude, bro"
end
test "returns error when user already registred", %{conn: conn, valid_params: valid_params} do
end
test "returns error when user already registred", %{conn: conn, valid_params: valid_params} do