projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[#468] Merged `upstream/develop`, resolved conflicts.
[akkoma]
/
test
/
web
/
oauth
/
token_test.exs
diff --git
a/test/web/oauth/token_test.exs
b/test/web/oauth/token_test.exs
index f926ff50bf340f32a6d8eab4c48a53ea02aeecd7..a708e4991775fcfe51bee17b503045f69c29df98 100644
(file)
--- a/
test/web/oauth/token_test.exs
+++ b/
test/web/oauth/token_test.exs
@@
-1,6
+1,12
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.OAuth.TokenTest do
use Pleroma.DataCase
defmodule Pleroma.Web.OAuth.TokenTest do
use Pleroma.DataCase
- alias Pleroma.Web.OAuth.{App, Token, Authorization}
+ alias Pleroma.Web.OAuth.App
+ alias Pleroma.Web.OAuth.Authorization
+ alias Pleroma.Web.OAuth.Token
alias Pleroma.Repo
import Pleroma.Factory
alias Pleroma.Repo
import Pleroma.Factory
@@
-10,7
+16,7
@@
defmodule Pleroma.Web.OAuth.TokenTest do
Repo.insert(
App.register_changeset(%App{}, %{
client_name: "client",
Repo.insert(
App.register_changeset(%App{}, %{
client_name: "client",
- scopes:
"scope"
,
+ scopes:
["scope"]
,
redirect_uris: "url"
})
)
redirect_uris: "url"
})
)
@@
-35,7
+41,7
@@
defmodule Pleroma.Web.OAuth.TokenTest do
Repo.insert(
App.register_changeset(%App{}, %{
client_name: "client1",
Repo.insert(
App.register_changeset(%App{}, %{
client_name: "client1",
- scopes:
"scope"
,
+ scopes:
["scope"]
,
redirect_uris: "url"
})
)
redirect_uris: "url"
})
)
@@
-44,7
+50,7
@@
defmodule Pleroma.Web.OAuth.TokenTest do
Repo.insert(
App.register_changeset(%App{}, %{
client_name: "client2",
Repo.insert(
App.register_changeset(%App{}, %{
client_name: "client2",
- scopes:
"scope"
,
+ scopes:
["scope"]
,
redirect_uris: "url"
})
)
redirect_uris: "url"
})
)
@@
-54,8
+60,8
@@
defmodule Pleroma.Web.OAuth.TokenTest do
{:ok, auth1} = Authorization.create_authorization(app1, user)
{:ok, auth2} = Authorization.create_authorization(app2, user)
{:ok, auth1} = Authorization.create_authorization(app1, user)
{:ok, auth2} = Authorization.create_authorization(app2, user)
- {:ok, token1} = Token.exchange_token(app1, auth1)
- {:ok, token2} = Token.exchange_token(app2, auth2)
+ {:ok,
_
token1} = Token.exchange_token(app1, auth1)
+ {:ok,
_
token2} = Token.exchange_token(app2, auth2)
{tokens, _} = Token.delete_user_tokens(user)
{tokens, _} = Token.delete_user_tokens(user)