projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into issue/1276
[akkoma]
/
test
/
web
/
oauth
/
oauth_controller_test.exs
diff --git
a/test/web/oauth/oauth_controller_test.exs
b/test/web/oauth/oauth_controller_test.exs
index 592612ddf06510ae29cc9e50bb10d2c13979fb3a..0b0972b17979f9aaad3521633201660854ff11db 100644
(file)
--- a/
test/web/oauth/oauth_controller_test.exs
+++ b/
test/web/oauth/oauth_controller_test.exs
@@
-17,8
+17,7
@@
defmodule Pleroma.Web.OAuth.OAuthControllerTest do
key: "_test",
signing_salt: "cooldude"
]
key: "_test",
signing_salt: "cooldude"
]
-
- clear_config([:instance, :account_activation_required])
+ setup do: clear_config([:instance, :account_activation_required])
describe "in OAuth consumer mode, " do
setup do
describe "in OAuth consumer mode, " do
setup do
@@
-31,7
+30,7
@@
defmodule Pleroma.Web.OAuth.OAuthControllerTest do
]
end
]
end
- clear_config([:auth, :oauth_consumer_strategies], ~w(twitter facebook))
+
setup do:
clear_config([:auth, :oauth_consumer_strategies], ~w(twitter facebook))
test "GET /oauth/authorize renders auth forms, including OAuth consumer form", %{
app: app,
test "GET /oauth/authorize renders auth forms, including OAuth consumer form", %{
app: app,
@@
-939,7
+938,7
@@
defmodule Pleroma.Web.OAuth.OAuthControllerTest do
end
describe "POST /oauth/token - refresh token" do
end
describe "POST /oauth/token - refresh token" do
- clear_config([:oauth2, :issue_new_refresh_token])
+
setup do:
clear_config([:oauth2, :issue_new_refresh_token])
test "issues a new access token with keep fresh token" do
Pleroma.Config.put([:oauth2, :issue_new_refresh_token], true)
test "issues a new access token with keep fresh token" do
Pleroma.Config.put([:oauth2, :issue_new_refresh_token], true)