Refactor and improve tests (#17386)
* Change account and user fabricators to simplify and improve tests - `Fabricate(:account)` implicitly fabricates an associated `user` if no `domain` attribute is given (an account with `domain: nil` is considered a local account, but no user record was created), unless `user: nil` is passed - `Fabricate(:account, user: Fabricate(:user))` should still be possible but is discouraged. * Fix and refactor tests - avoid passing unneeded attributes to `Fabricate(:user)` or `Fabricate(:account)` - avoid embedding `Fabricate(:user)` into a `Fabricate(:account)` or the other way around - prefer `Fabricate(:user, account_attributes: …)` to `Fabricate(:user, account: Fabricate(:account, …)` - also, some tests were using remote accounts with local user records, which is not representative of production code.
This commit is contained in:
parent
03d59340da
commit
e38fc319dc
95 changed files with 187 additions and 185 deletions
|
@ -194,12 +194,12 @@ RSpec.describe User, type: :model do
|
|||
end
|
||||
|
||||
it "returns 'private' if user has not configured default privacy setting and account is locked" do
|
||||
user = Fabricate(:user, account: Fabricate(:account, locked: true))
|
||||
user = Fabricate(:account, locked: true).user
|
||||
expect(user.setting_default_privacy).to eq 'private'
|
||||
end
|
||||
|
||||
it "returns 'public' if user has not configured default privacy setting and account is not locked" do
|
||||
user = Fabricate(:user, account: Fabricate(:account, locked: false))
|
||||
user = Fabricate(:account, locked: false).user
|
||||
expect(user.setting_default_privacy).to eq 'public'
|
||||
end
|
||||
end
|
||||
|
@ -248,7 +248,7 @@ RSpec.describe User, type: :model do
|
|||
|
||||
it_behaves_like 'Settings-extended' do
|
||||
def create!
|
||||
User.create!(account: Fabricate(:account), email: 'foo@mastodon.space', password: 'abcd1234', agreement: true)
|
||||
User.create!(account: Fabricate(:account, user: nil), email: 'foo@mastodon.space', password: 'abcd1234', agreement: true)
|
||||
end
|
||||
|
||||
def fabricate
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue