projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
[akkoma]
/
test
/
integration
/
mastodon_websocket_test.exs
diff --git
a/test/integration/mastodon_websocket_test.exs
b/test/integration/mastodon_websocket_test.exs
index 0c513b6e75feab22454ee2df23a5afbef7d37dae..b42c9ef073deec7672a24cc43b79d20758d9b5f6 100644
(file)
--- a/
test/integration/mastodon_websocket_test.exs
+++ b/
test/integration/mastodon_websocket_test.exs
@@
-7,9
+7,9
@@
defmodule Pleroma.Integration.MastodonWebsocketTest do
import Pleroma.Factory
import Pleroma.Factory
+ alias Pleroma.Integration.WebsocketClient
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.OAuth
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.OAuth
- alias Pleroma.Integration.WebsocketClient
alias Pleroma.Web.Streamer
@path Pleroma.Web.Endpoint.url()
alias Pleroma.Web.Streamer
@path Pleroma.Web.Endpoint.url()