diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-10-08 13:51:33 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-08 13:51:33 +0200 |
commit | d17844e6d1ad700df0f704972e2ce16e8693d33b (patch) | |
tree | ada49442558fb14c6cf97e79fb6e2dcaa237c7a6 /spec/fabricators | |
parent | 96c3d26870d4c8db1978c86b259e85d060d6f271 (diff) | |
parent | 4c4ff05a461eddafbf38c603b1bf2029be36a0b9 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'spec/fabricators')
-rw-r--r-- | spec/fabricators/conversation_account_fabricator.rb | 6 | ||||
-rw-r--r-- | spec/fabricators/user_fabricator.rb | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/spec/fabricators/conversation_account_fabricator.rb b/spec/fabricators/conversation_account_fabricator.rb new file mode 100644 index 000000000..f57ffd535 --- /dev/null +++ b/spec/fabricators/conversation_account_fabricator.rb @@ -0,0 +1,6 @@ +Fabricator(:conversation_account) do + account nil + conversation nil + participant_account_ids "" + last_status nil +end diff --git a/spec/fabricators/user_fabricator.rb b/spec/fabricators/user_fabricator.rb index cf51fe81d..7dfbdb52d 100644 --- a/spec/fabricators/user_fabricator.rb +++ b/spec/fabricators/user_fabricator.rb @@ -2,5 +2,5 @@ Fabricator(:user) do account email { sequence(:email) { |i| "#{i}#{Faker::Internet.email}" } } password "123456789" - confirmed_at { Time.now } + confirmed_at { Time.zone.now } end |