summaryrefslogtreecommitdiff
path: root/test/support
diff options
context:
space:
mode:
authorIvan Tashkinov <ivant.business@gmail.com>2019-03-15 17:11:00 +0300
committerIvan Tashkinov <ivant.business@gmail.com>2019-03-15 17:11:00 +0300
commit273905744242b013ba9736ff7e1415a0499022d1 (patch)
tree146f5ad5428130dce0076ea9f6398035d7ac88f6 /test/support
parentaacbf0f57053786533df045125dee93ace0daa93 (diff)
parent41fc67aa4993c119dae82578df7309d3999ac47a (diff)
downloadpleroma-273905744242b013ba9736ff7e1415a0499022d1.tar.gz
pleroma-273905744242b013ba9736ff7e1415a0499022d1.zip
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
Diffstat (limited to 'test/support')
-rw-r--r--test/support/builders/user_builder.ex2
-rw-r--r--test/support/captcha_mock.ex2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/support/builders/user_builder.ex b/test/support/builders/user_builder.ex
index 611a5be18..f58e1b0ad 100644
--- a/test/support/builders/user_builder.ex
+++ b/test/support/builders/user_builder.ex
@@ -1,6 +1,6 @@
defmodule Pleroma.Builders.UserBuilder do
- alias Pleroma.User
alias Pleroma.Repo
+ alias Pleroma.User
def build(data \\ %{}) do
user = %User{
diff --git a/test/support/captcha_mock.ex b/test/support/captcha_mock.ex
index 9061f2b45..ef4e68bc5 100644
--- a/test/support/captcha_mock.ex
+++ b/test/support/captcha_mock.ex
@@ -7,7 +7,7 @@ defmodule Pleroma.Captcha.Mock do
@behaviour Service
@impl Service
- def new(), do: %{type: :mock}
+ def new, do: %{type: :mock}
@impl Service
def validate(_token, _captcha, _data), do: :ok