diff options
| author | lain <lain@soykaf.club> | 2020-05-13 12:44:16 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-13 12:44:16 +0200 |
| commit | 3cff4e24cd8c56af47b1983ea97ec4643dbc183e (patch) | |
| tree | 63e27727ca94f1b57832d6e872ad319c97719bbb /test/support | |
| parent | c0ea5c60e4e709d3d4415de42a65f878b55dc3bb (diff) | |
| parent | 6706cdce65f8b2dda55380dbfdad5e41e600af2d (diff) | |
| download | pleroma-3cff4e24cd8c56af47b1983ea97ec4643dbc183e.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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(), |