Merge branch 'master' into attribute-searching

This commit is contained in:
evazion
2020-08-17 14:23:00 -05:00
committed by GitHub
155 changed files with 2834 additions and 2169 deletions

View File

@@ -1,6 +1,7 @@
FactoryBot.define do
factory(:ban) do |f|
banner :factory => :admin_user
user
reason {FFaker::Lorem.words.join(" ")}
duration {60}
end

View File

@@ -1,8 +1,7 @@
FactoryBot.define do
factory(:post_flag) do
creator factory: :user, created_at: 2.weeks.ago
post
creator
post { build(:post, is_flagged: true) }
reason {"xxx"}
is_resolved {false}
end
end