projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Resolve merge conflict
[akkoma]
/
test
/
web
/
oauth
/
authorization_test.exs
diff --git
a/test/web/oauth/authorization_test.exs
b/test/web/oauth/authorization_test.exs
index 98c7c4133216e258cd626032692ebd1de858ec2d..3b1ddada81e70fcce978833e8782d4b8da472aae 100644
(file)
--- a/
test/web/oauth/authorization_test.exs
+++ b/
test/web/oauth/authorization_test.exs
@@
-1,3
+1,7
@@
+# 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.AuthorizationTest do
use Pleroma.DataCase
alias Pleroma.Web.OAuth.{Authorization, App}
defmodule Pleroma.Web.OAuth.AuthorizationTest do
use Pleroma.DataCase
alias Pleroma.Web.OAuth.{Authorization, App}
@@
-71,7
+75,7
@@
defmodule Pleroma.Web.OAuth.AuthorizationTest do
{:ok, auth} = Authorization.create_authorization(app, user)
{:ok, auth} = Authorization.use_token(auth)
{:ok, auth} = Authorization.create_authorization(app, user)
{:ok, auth} = Authorization.use_token(auth)
-
{auths, _} =
Authorization.delete_user_authorizations(user)
+ Authorization.delete_user_authorizations(user)
{_, invalid} = Authorization.use_token(auth)
{_, invalid} = Authorization.use_token(auth)