diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-03-14 22:33:20 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-03-14 22:33:20 +0300 |
| commit | cbdd11c38111fd7c195983f40265b675e1201d4e (patch) | |
| tree | 44c63ed6430a743cfe589fed5213467a0dd6dabb /test/web/common_api | |
| parent | 355f285a8693934fbc8205c2c9ecde0a758fc158 (diff) | |
| parent | 34fc0dca2e879bcbb73acc80fdc72678411d0ebf (diff) | |
| download | pleroma-cbdd11c38111fd7c195983f40265b675e1201d4e.tar.gz pleroma-cbdd11c38111fd7c195983f40265b675e1201d4e.zip | |
Merge develop to bump elixir version in the CI so I don't get failing formatting
Diffstat (limited to 'test/web/common_api')
| -rw-r--r-- | test/web/common_api/common_api_test.exs | 4 | ||||
| -rw-r--r-- | test/web/common_api/common_api_utils_test.exs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/web/common_api/common_api_test.exs b/test/web/common_api/common_api_test.exs index 9ba320f59..181813c76 100644 --- a/test/web/common_api/common_api_test.exs +++ b/test/web/common_api/common_api_test.exs @@ -4,9 +4,9 @@ defmodule Pleroma.Web.CommonAPITest do use Pleroma.DataCase - alias Pleroma.Web.CommonAPI - alias Pleroma.User alias Pleroma.Activity + alias Pleroma.User + alias Pleroma.Web.CommonAPI import Pleroma.Factory diff --git a/test/web/common_api/common_api_utils_test.exs b/test/web/common_api/common_api_utils_test.exs index 684f2a23f..4c97b0d62 100644 --- a/test/web/common_api/common_api_utils_test.exs +++ b/test/web/common_api/common_api_utils_test.exs @@ -3,9 +3,9 @@ # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.CommonAPI.UtilsTest do + alias Pleroma.Builders.UserBuilder alias Pleroma.Web.CommonAPI.Utils alias Pleroma.Web.Endpoint - alias Pleroma.Builders.UserBuilder use Pleroma.DataCase test "it adds attachment links to a given text and attachment set" do |