diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-01 19:23:14 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-01 19:23:14 +0200 |
| commit | 45deca65b3fb8e9f19818e3db7d315cab0572d1a (patch) | |
| tree | 1b9bab6ec764e8a6600d245595facd5694287e16 /spec/fabricators | |
| parent | 39a0622de70dc24275808cee9526658bd68a55ed (diff) | |
| parent | 6d23d40420e4548778f3ca4ed9e8cb16e0eb0073 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/packs/public.js`: Conflict because part of that file has been split to `app/javascript/core/settings.js`. Ported those changes there.
Diffstat (limited to 'spec/fabricators')
| -rw-r--r-- | spec/fabricators/account_migration_fabricator.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/fabricators/account_migration_fabricator.rb b/spec/fabricators/account_migration_fabricator.rb index 3b3fc2077..2a8e747a8 100644 --- a/spec/fabricators/account_migration_fabricator.rb +++ b/spec/fabricators/account_migration_fabricator.rb @@ -1,6 +1,6 @@ Fabricator(:account_migration) do account - target_account + target_account { |attrs| Fabricate(:account, also_known_as: [ActivityPub::TagManager.instance.uri_for(attrs[:account])]) } + acct { |attrs| attrs[:target_account].acct } followers_count 1234 - acct 'test@example.com' end |