projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'cachex-test' into 'develop'
[akkoma]
/
test
/
pleroma
/
web
/
mastodon_api
/
update_credentials_test.exs
diff --git
a/test/pleroma/web/mastodon_api/update_credentials_test.exs
b/test/pleroma/web/mastodon_api/update_credentials_test.exs
index fe462caa38c07739e182c264093c2ab774280c51..023726468ef070892b7ee9808ddcc633da2753ea 100644
(file)
--- a/
test/pleroma/web/mastodon_api/update_credentials_test.exs
+++ b/
test/pleroma/web/mastodon_api/update_credentials_test.exs
@@
-11,8
+11,6
@@
defmodule Pleroma.Web.MastodonAPI.UpdateCredentialsTest do
import Mock
import Pleroma.Factory
import Mock
import Pleroma.Factory
- setup do: clear_config([:instance, :max_account_fields])
-
describe "updating credentials" do
setup do: oauth_access(["write:accounts"])
setup :request_content_type
describe "updating credentials" do
setup do: oauth_access(["write:accounts"])
setup :request_content_type
@@
-222,7
+220,7
@@
defmodule Pleroma.Web.MastodonAPI.UpdateCredentialsTest do
test "updates the user's avatar", %{user: user, conn: conn} do
new_avatar = %Plug.Upload{
test "updates the user's avatar", %{user: user, conn: conn} do
new_avatar = %Plug.Upload{
- content_type: "image/jpg",
+ content_type: "image/jp
e
g",
path: Path.absname("test/fixtures/image.jpg"),
filename: "an_image.jpg"
}
path: Path.absname("test/fixtures/image.jpg"),
filename: "an_image.jpg"
}
@@
-246,7
+244,7
@@
defmodule Pleroma.Web.MastodonAPI.UpdateCredentialsTest do
test "updates the user's banner", %{user: user, conn: conn} do
new_header = %Plug.Upload{
test "updates the user's banner", %{user: user, conn: conn} do
new_header = %Plug.Upload{
- content_type: "image/jpg",
+ content_type: "image/jp
e
g",
path: Path.absname("test/fixtures/image.jpg"),
filename: "an_image.jpg"
}
path: Path.absname("test/fixtures/image.jpg"),
filename: "an_image.jpg"
}
@@
-265,7
+263,7
@@
defmodule Pleroma.Web.MastodonAPI.UpdateCredentialsTest do
test "updates the user's background", %{conn: conn, user: user} do
new_header = %Plug.Upload{
test "updates the user's background", %{conn: conn, user: user} do
new_header = %Plug.Upload{
- content_type: "image/jpg",
+ content_type: "image/jp
e
g",
path: Path.absname("test/fixtures/image.jpg"),
filename: "an_image.jpg"
}
path: Path.absname("test/fixtures/image.jpg"),
filename: "an_image.jpg"
}
@@
-446,7
+444,7
@@
defmodule Pleroma.Web.MastodonAPI.UpdateCredentialsTest do
|> patch("/api/v1/accounts/update_credentials", %{"fields_attributes" => fields})
|> json_response_and_validate_schema(403)
|> patch("/api/v1/accounts/update_credentials", %{"fields_attributes" => fields})
|> json_response_and_validate_schema(403)
-
Pleroma.Config.put
([:instance, :max_account_fields], 1)
+
clear_config
([:instance, :max_account_fields], 1)
fields = [
%{"name" => "foo", "value" => "bar"},
fields = [
%{"name" => "foo", "value" => "bar"},