diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-08-07 13:56:48 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-07 13:56:48 +0200 |
| commit | 04534604c654060eca24628247fdb51b7ff5372a (patch) | |
| tree | f8ae222e84056fb2674d23187e66517da1fc2af9 /spec/fabricators | |
| parent | 8400ddca7155005ab79485ed6054c04ea3ca5667 (diff) | |
| parent | ac33f1aedd9a6c72c6c176afb1f5d62a1ce5d44d (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/views/admin/dashboard/index.html.haml - config/locales/simple_form.en.yml
Diffstat (limited to 'spec/fabricators')
| -rw-r--r-- | spec/fabricators/account_fabricator.rb | 2 | ||||
| -rw-r--r-- | spec/fabricators/account_identity_proof_fabricator.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/fabricators/account_fabricator.rb b/spec/fabricators/account_fabricator.rb index f12464ef3..ab900c5fa 100644 --- a/spec/fabricators/account_fabricator.rb +++ b/spec/fabricators/account_fabricator.rb @@ -4,7 +4,7 @@ private_key = keypair.to_pem Fabricator(:account) do transient :suspended, :silenced - username { sequence(:username) { |i| "#{Faker::Internet.user_name(nil, %w(_))}#{i}" } } + username { sequence(:username) { |i| "#{Faker::Internet.user_name(separators: %w(_))}#{i}" } } last_webfingered_at { Time.now.utc } public_key { public_key } private_key { private_key } diff --git a/spec/fabricators/account_identity_proof_fabricator.rb b/spec/fabricators/account_identity_proof_fabricator.rb index 94f40dfd6..7b932fa96 100644 --- a/spec/fabricators/account_identity_proof_fabricator.rb +++ b/spec/fabricators/account_identity_proof_fabricator.rb @@ -1,7 +1,7 @@ Fabricator(:account_identity_proof) do account provider 'keybase' - provider_username { sequence(:provider_username) { |i| "#{Faker::Lorem.characters(15)}" } } + provider_username { sequence(:provider_username) { |i| "#{Faker::Lorem.characters(number: 15)}" } } token { sequence(:token) { |i| "#{i}#{Faker::Crypto.sha1()*2}"[0..65] } } verified false live false |