diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-14 20:19:56 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-14 20:19:56 +0300 |
| commit | e4b12494d77e7a6920a408d62d5b8fe0f886a14d (patch) | |
| tree | 5b58e0cfaf33dc2fccd809e887e1194baa6b1191 /test/support | |
| parent | f1f588fd5271c0b3bf09df002a83dbb57c42bae0 (diff) | |
| parent | e455ca3f3eee74db0b1e60550acf53bea915be3b (diff) | |
| download | pleroma-e4b12494d77e7a6920a408d62d5b8fe0f886a14d.tar.gz pleroma-e4b12494d77e7a6920a408d62d5b8fe0f886a14d.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# mix.lock
Diffstat (limited to 'test/support')
| -rw-r--r-- | test/support/builders/user_builder.ex | 2 | ||||
| -rw-r--r-- | test/support/factory.ex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/support/builders/user_builder.ex b/test/support/builders/user_builder.ex index 0d0490714..0c687c029 100644 --- a/test/support/builders/user_builder.ex +++ b/test/support/builders/user_builder.ex @@ -7,7 +7,7 @@ defmodule Pleroma.Builders.UserBuilder do email: "test@example.org", name: "Test Name", nickname: "testname", - password_hash: Comeonin.Pbkdf2.hashpwsalt("test"), + password_hash: Pbkdf2.hash_pwd_salt("test"), bio: "A tester.", ap_id: "some id", last_digest_emailed_at: NaiveDateTime.truncate(NaiveDateTime.utc_now(), :second), diff --git a/test/support/factory.ex b/test/support/factory.ex index c8c45e2a7..d4284831c 100644 --- a/test/support/factory.ex +++ b/test/support/factory.ex @@ -29,7 +29,7 @@ defmodule Pleroma.Factory do name: sequence(:name, &"Test ใในใ User #{&1}"), email: sequence(:email, &"user#{&1}@example.com"), nickname: sequence(:nickname, &"nick#{&1}"), - password_hash: Comeonin.Pbkdf2.hashpwsalt("test"), + password_hash: Pbkdf2.hash_pwd_salt("test"), bio: sequence(:bio, &"Tester Number #{&1}"), last_digest_emailed_at: NaiveDateTime.utc_now(), last_refreshed_at: NaiveDateTime.utc_now(), |