projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
[akkoma]
/
test
/
support
/
builders
/
user_builder.ex
diff --git
a/test/support/builders/user_builder.ex
b/test/support/builders/user_builder.ex
index 1e1e80ac9a96a4031275c7716fed1eeef282ab44..f58e1b0ad370df0422fd623657b78334bb992664 100644
(file)
--- a/
test/support/builders/user_builder.ex
+++ b/
test/support/builders/user_builder.ex
@@
-1,5
+1,6
@@
defmodule Pleroma.Builders.UserBuilder do
defmodule Pleroma.Builders.UserBuilder do
- alias Pleroma.{User, Repo}
+ alias Pleroma.Repo
+ alias Pleroma.User
def build(data \\ %{}) do
user = %User{
def build(data \\ %{}) do
user = %User{
@@
-10,6
+11,7
@@
defmodule Pleroma.Builders.UserBuilder do
bio: "A tester.",
ap_id: "some id"
}
bio: "A tester.",
ap_id: "some id"
}
+
Map.merge(user, data)
end
Map.merge(user, data)
end