diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-15 17:11:00 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-15 17:11:00 +0300 |
| commit | 273905744242b013ba9736ff7e1415a0499022d1 (patch) | |
| tree | 146f5ad5428130dce0076ea9f6398035d7ac88f6 /test/web/oauth | |
| parent | aacbf0f57053786533df045125dee93ace0daa93 (diff) | |
| parent | 41fc67aa4993c119dae82578df7309d3999ac47a (diff) | |
| download | pleroma-273905744242b013ba9736ff7e1415a0499022d1.tar.gz pleroma-273905744242b013ba9736ff7e1415a0499022d1.zip | |
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
Diffstat (limited to 'test/web/oauth')
| -rw-r--r-- | test/web/oauth/authorization_test.exs | 2 | ||||
| -rw-r--r-- | test/web/oauth/token_test.exs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/web/oauth/authorization_test.exs b/test/web/oauth/authorization_test.exs index 306db2e62..d8b008437 100644 --- a/test/web/oauth/authorization_test.exs +++ b/test/web/oauth/authorization_test.exs @@ -4,8 +4,8 @@ defmodule Pleroma.Web.OAuth.AuthorizationTest do use Pleroma.DataCase - alias Pleroma.Web.OAuth.Authorization alias Pleroma.Web.OAuth.App + alias Pleroma.Web.OAuth.Authorization import Pleroma.Factory setup do diff --git a/test/web/oauth/token_test.exs b/test/web/oauth/token_test.exs index 62444a0fa..ad2a49f09 100644 --- a/test/web/oauth/token_test.exs +++ b/test/web/oauth/token_test.exs @@ -4,10 +4,10 @@ defmodule Pleroma.Web.OAuth.TokenTest do use Pleroma.DataCase + alias Pleroma.Repo alias Pleroma.Web.OAuth.App alias Pleroma.Web.OAuth.Authorization alias Pleroma.Web.OAuth.Token - alias Pleroma.Repo import Pleroma.Factory |