summaryrefslogtreecommitdiff
path: root/test/web/oauth
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2019-02-19 16:58:28 +0000
committerMark Felder <feld@FreeBSD.org>2019-02-19 16:58:28 +0000
commit2d21ea1a0e1be2e737dc4d283e72207580856214 (patch)
treef377cf25c36de97d664f13cebacb6ff2e0d43b91 /test/web/oauth
parent10a11f083ca543022c61e24b1ec0cc83811d6d06 (diff)
parent1dd718e83c76db218f12a98344b568fe10ecbefe (diff)
downloadpleroma-2d21ea1a0e1be2e737dc4d283e72207580856214.tar.gz
pleroma-2d21ea1a0e1be2e737dc4d283e72207580856214.zip
Merge branch 'develop' into fix/twittercards
Diffstat (limited to 'test/web/oauth')
-rw-r--r--test/web/oauth/authorization_test.exs3
-rw-r--r--test/web/oauth/oauth_controller_test.exs3
-rw-r--r--test/web/oauth/token_test.exs4
3 files changed, 7 insertions, 3 deletions
diff --git a/test/web/oauth/authorization_test.exs b/test/web/oauth/authorization_test.exs
index 3b1ddada8..81618e935 100644
--- a/test/web/oauth/authorization_test.exs
+++ b/test/web/oauth/authorization_test.exs
@@ -4,7 +4,8 @@
defmodule Pleroma.Web.OAuth.AuthorizationTest do
use Pleroma.DataCase
- alias Pleroma.Web.OAuth.{Authorization, App}
+ alias Pleroma.Web.OAuth.Authorization
+ alias Pleroma.Web.OAuth.App
import Pleroma.Factory
test "create an authorization token for a valid app" do
diff --git a/test/web/oauth/oauth_controller_test.exs b/test/web/oauth/oauth_controller_test.exs
index e0d3cb55f..2315f9a34 100644
--- a/test/web/oauth/oauth_controller_test.exs
+++ b/test/web/oauth/oauth_controller_test.exs
@@ -7,7 +7,8 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do
import Pleroma.Factory
alias Pleroma.Repo
- alias Pleroma.Web.OAuth.{Authorization, Token}
+ alias Pleroma.Web.OAuth.Authorization
+ alias Pleroma.Web.OAuth.Token
test "redirects with oauth authorization" do
user = insert(:user)
diff --git a/test/web/oauth/token_test.exs b/test/web/oauth/token_test.exs
index 9a241d61a..4dab4a308 100644
--- a/test/web/oauth/token_test.exs
+++ b/test/web/oauth/token_test.exs
@@ -4,7 +4,9 @@
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