diff --git a/spec/controllers/accounts_controller_spec.rb b/spec/controllers/accounts_controller_spec.rb
index 7c5ba8754d5e6287c4b629697d7929535ae64402..73d12402919dc2a052faec9e9b9265c4a87bbb80 100644
--- a/spec/controllers/accounts_controller_spec.rb
+++ b/spec/controllers/accounts_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
RSpec.describe AccountsController, type: :controller do
render_views
- let(:account) { Fabricate(:user).account }
+ let(:account) { Fabricate(:account) }
shared_examples 'cachable response' do
it 'does not set cookies' do
diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb
index 3edbde03cb4f8896ac05154ab2617b9b52e05e50..0f71d697cd42bf21892bf709d102d5a869effef2 100644
--- a/spec/controllers/admin/accounts_controller_spec.rb
+++ b/spec/controllers/admin/accounts_controller_spec.rb
@@ -61,7 +61,7 @@ RSpec.describe Admin::AccountsController, type: :controller do
describe 'GET #show' do
let(:current_user) { Fabricate(:user, admin: true) }
- let(:account) { Fabricate(:account, username: 'bob') }
+ let(:account) { Fabricate(:account) }
it 'returns http success' do
get :show, params: { id: account.id }
@@ -73,7 +73,7 @@ RSpec.describe Admin::AccountsController, type: :controller do
subject { post :memorialize, params: { id: account.id } }
let(:current_user) { Fabricate(:user, admin: current_user_admin) }
- let(:account) { Fabricate(:account, user: user) }
+ let(:account) { user.account }
let(:user) { Fabricate(:user, admin: target_user_admin) }
context 'when user is admin' do
@@ -125,7 +125,7 @@ RSpec.describe Admin::AccountsController, type: :controller do
subject { post :enable, params: { id: account.id } }
let(:current_user) { Fabricate(:user, admin: admin) }
- let(:account) { Fabricate(:account, user: user) }
+ let(:account) { user.account }
let(:user) { Fabricate(:user, disabled: true) }
context 'when user is admin' do
diff --git a/spec/controllers/admin/change_email_controller_spec.rb b/spec/controllers/admin/change_email_controller_spec.rb
index 31df0f0fcec556a40f5af1958171502989a177c0..e7f3f7c97d7df5e700ebcc764882809a25b14e2a 100644
--- a/spec/controllers/admin/change_email_controller_spec.rb
+++ b/spec/controllers/admin/change_email_controller_spec.rb
@@ -11,10 +11,9 @@ RSpec.describe Admin::ChangeEmailsController, type: :controller do
describe "GET #show" do
it "returns http success" do
- account = Fabricate(:account)
- user = Fabricate(:user, account: account)
+ user = Fabricate(:user)
- get :show, params: { account_id: account.id }
+ get :show, params: { account_id: user.account.id }
expect(response).to have_http_status(200)
end
@@ -26,12 +25,11 @@ RSpec.describe Admin::ChangeEmailsController, type: :controller do
end
it "returns http success" do
- account = Fabricate(:account)
- user = Fabricate(:user, account: account)
+ user = Fabricate(:user)
previous_email = user.email
- post :update, params: { account_id: account.id, user: { unconfirmed_email: 'test@example.com' } }
+ post :update, params: { account_id: user.account.id, user: { unconfirmed_email: 'test@example.com' } }
user.reload
@@ -41,7 +39,7 @@ RSpec.describe Admin::ChangeEmailsController, type: :controller do
expect(UserMailer).to have_received(:confirmation_instructions).with(user, user.confirmation_token, { to: 'test@example.com' })
- expect(response).to redirect_to(admin_account_path(account.id))
+ expect(response).to redirect_to(admin_account_path(user.account.id))
end
end
end
diff --git a/spec/controllers/admin/confirmations_controller_spec.rb b/spec/controllers/admin/confirmations_controller_spec.rb
index eec2b2f5c48f6e95b2ea7172a4c43fafc1bddd09..5b4f7e925c3db74ea2e047a1f7ec958a01981e9c 100644
--- a/spec/controllers/admin/confirmations_controller_spec.rb
+++ b/spec/controllers/admin/confirmations_controller_spec.rb
@@ -9,9 +9,8 @@ RSpec.describe Admin::ConfirmationsController, type: :controller do
describe 'POST #create' do
it 'confirms the user' do
- account = Fabricate(:account)
- user = Fabricate(:user, confirmed_at: false, account: account)
- post :create, params: { account_id: account.id }
+ user = Fabricate(:user, confirmed_at: false)
+ post :create, params: { account_id: user.account.id }
expect(response).to redirect_to(admin_accounts_path)
expect(user.reload).to be_confirmed
@@ -32,10 +31,9 @@ RSpec.describe Admin::ConfirmationsController, type: :controller do
end
describe 'POST #resernd' do
- subject { post :resend, params: { account_id: account.id } }
+ subject { post :resend, params: { account_id: user.account.id } }
- let(:account) { Fabricate(:account) }
- let!(:user) { Fabricate(:user, confirmed_at: confirmed_at, account: account) }
+ let!(:user) { Fabricate(:user, confirmed_at: confirmed_at) }
before do
allow(UserMailer).to receive(:confirmation_instructions) { double(:email, deliver_later: nil) }
diff --git a/spec/controllers/admin/resets_controller_spec.rb b/spec/controllers/admin/resets_controller_spec.rb
index c1e34b7f96801ae30b2aa84cec5d687839b4d9ab..28510b5afb5803dcd1f0988748152ce5554a1399 100644
--- a/spec/controllers/admin/resets_controller_spec.rb
+++ b/spec/controllers/admin/resets_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
describe Admin::ResetsController do
render_views
- let(:account) { Fabricate(:account, user: Fabricate(:user)) }
+ let(:account) { Fabricate(:account) }
before do
sign_in Fabricate(:user, admin: true), scope: :user
end
diff --git a/spec/controllers/api/base_controller_spec.rb b/spec/controllers/api/base_controller_spec.rb
index 05a42d1c19597b608061fc01ccaddbc7a615a992..c286b8cbfc3d895891bf1747f814034c706d3942 100644
--- a/spec/controllers/api/base_controller_spec.rb
+++ b/spec/controllers/api/base_controller_spec.rb
@@ -28,7 +28,7 @@ describe Api::BaseController do
end
describe 'non-functional accounts handling' do
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read') }
controller do
diff --git a/spec/controllers/api/v1/accounts/credentials_controller_spec.rb b/spec/controllers/api/v1/accounts/credentials_controller_spec.rb
index 9fb0d8770045e468b6ad461a45bf4270a61be91b..b2557d957575fce8ae1f667c6a8f39a23d37acc1 100644
--- a/spec/controllers/api/v1/accounts/credentials_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/credentials_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
describe Api::V1::Accounts::CredentialsController do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
context 'with an oauth token' do
diff --git a/spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb b/spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb
index 482a19ef2c76050283319bf3afc2870a513e0e5d..1e6e1d8e0ab304c893f8600d415c001a9cb1016f 100644
--- a/spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
describe Api::V1::Accounts::FollowerAccountsController do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }
let(:account) { Fabricate(:account) }
let(:alice) { Fabricate(:account) }
@@ -49,10 +49,10 @@ describe Api::V1::Accounts::FollowerAccountsController do
end
context 'when requesting user is the account owner' do
- let(:user) { Fabricate(:user, account: account) }
+ let(:user) { account.user }
it 'returns all accounts, including muted accounts' do
- user.account.mute!(bob)
+ account.mute!(bob)
get :index, params: { account_id: account.id, limit: 2 }
expect(body_as_json.size).to eq 2
diff --git a/spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb b/spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb
index e35b625fe8ddf3e5cdf154c65dfa534685bb53c8..cc962c6ee38b3741a596384ed59fe6465f6511af 100644
--- a/spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
describe Api::V1::Accounts::FollowingAccountsController do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }
let(:account) { Fabricate(:account) }
let(:alice) { Fabricate(:account) }
@@ -49,10 +49,10 @@ describe Api::V1::Accounts::FollowingAccountsController do
end
context 'when requesting user is the account owner' do
- let(:user) { Fabricate(:user, account: account) }
+ let(:user) { account.user }
it 'returns all accounts, including muted accounts' do
- user.account.mute!(bob)
+ account.mute!(bob)
get :index, params: { account_id: account.id, limit: 2 }
expect(body_as_json.size).to eq 2
diff --git a/spec/controllers/api/v1/accounts/lists_controller_spec.rb b/spec/controllers/api/v1/accounts/lists_controller_spec.rb
index baafea8e6bee876cdc8b921d1805244e73427e65..d714856335638469ea0d8bd86696962094014aa7 100644
--- a/spec/controllers/api/v1/accounts/lists_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/lists_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
describe Api::V1::Accounts::ListsController do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:lists') }
let(:account) { Fabricate(:account) }
let(:list) { Fabricate(:list, account: user.account) }
diff --git a/spec/controllers/api/v1/accounts/notes_controller_spec.rb b/spec/controllers/api/v1/accounts/notes_controller_spec.rb
index 0a2957fedece68dc4a689e9ee10705331584d495..47d595c705f8679e7f55fa7d7b4133d0719e0719 100644
--- a/spec/controllers/api/v1/accounts/notes_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/notes_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
describe Api::V1::Accounts::NotesController do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:accounts') }
let(:account) { Fabricate(:account) }
let(:comment) { 'foo' }
diff --git a/spec/controllers/api/v1/accounts/pins_controller_spec.rb b/spec/controllers/api/v1/accounts/pins_controller_spec.rb
index c71935df21330a376ff85c7eb78b0fd37f553dd4..19bba093e43ceaf8eeefe0550846af9613a4637e 100644
--- a/spec/controllers/api/v1/accounts/pins_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/pins_controller_spec.rb
@@ -3,8 +3,8 @@
require 'rails_helper'
RSpec.describe Api::V1::Accounts::PinsController, type: :controller do
- let(:john) { Fabricate(:user, account: Fabricate(:account, username: 'john')) }
- let(:kevin) { Fabricate(:user, account: Fabricate(:account, username: 'kevin')) }
+ let(:john) { Fabricate(:user) }
+ let(:kevin) { Fabricate(:user) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: john.id, scopes: 'write:accounts') }
before do
diff --git a/spec/controllers/api/v1/accounts/relationships_controller_spec.rb b/spec/controllers/api/v1/accounts/relationships_controller_spec.rb
index fe715ff62597327c206178d8a5ee2d82448dcc1c..69ad0d061a66d51d586e161cec9d3578209da199 100644
--- a/spec/controllers/api/v1/accounts/relationships_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/relationships_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
describe Api::V1::Accounts::RelationshipsController do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:follows') }
before do
@@ -11,8 +11,8 @@ describe Api::V1::Accounts::RelationshipsController do
end
describe 'GET #index' do
- let(:simon) { Fabricate(:user, email: 'simon@example.com', account: Fabricate(:account, username: 'simon')).account }
- let(:lewis) { Fabricate(:user, email: 'lewis@example.com', account: Fabricate(:account, username: 'lewis')).account }
+ let(:simon) { Fabricate(:account) }
+ let(:lewis) { Fabricate(:account) }
before do
user.account.follow!(simon)
diff --git a/spec/controllers/api/v1/accounts/search_controller_spec.rb b/spec/controllers/api/v1/accounts/search_controller_spec.rb
index 8ff2b17deed98bd1d9b4e0d010347b7d41c10f2d..5b23bff6810964506c9b85fbea8fdba7186d3e41 100644
--- a/spec/controllers/api/v1/accounts/search_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/search_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
RSpec.describe Api::V1::Accounts::SearchController, type: :controller do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') }
before do
diff --git a/spec/controllers/api/v1/accounts/statuses_controller_spec.rb b/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
index 0a18ddcbdd4e1a20c49a4372604d769a5dc17c8b..348de08c2c2a46d6ff5f318d4587114c5cea0dcf 100644
--- a/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/statuses_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
describe Api::V1::Accounts::StatusesController do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses') }
before do
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb
index 9a5a7c72a7ca7e15afaccd89e78dcadb68cac617..5d5c245c50f01b761f91587031cc43bca8a11bdc 100644
--- a/spec/controllers/api/v1/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
RSpec.describe Api::V1::AccountsController, type: :controller do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:scopes) { '' }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
@@ -69,7 +69,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
describe 'POST #follow' do
let(:scopes) { 'write:follows' }
- let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob', locked: locked)).account }
+ let(:other_account) { Fabricate(:account, username: 'bob', locked: locked) }
context do
before do
@@ -150,7 +150,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
describe 'POST #unfollow' do
let(:scopes) { 'write:follows' }
- let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:other_account) { Fabricate(:account, username: 'bob') }
before do
user.account.follow!(other_account)
@@ -170,7 +170,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
describe 'POST #remove_from_followers' do
let(:scopes) { 'write:follows' }
- let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:other_account) { Fabricate(:account, username: 'bob') }
before do
other_account.follow!(user.account)
@@ -190,7 +190,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
describe 'POST #block' do
let(:scopes) { 'write:blocks' }
- let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:other_account) { Fabricate(:account, username: 'bob') }
before do
user.account.follow!(other_account)
@@ -214,7 +214,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
describe 'POST #unblock' do
let(:scopes) { 'write:blocks' }
- let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:other_account) { Fabricate(:account, username: 'bob') }
before do
user.account.block!(other_account)
@@ -234,7 +234,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
describe 'POST #mute' do
let(:scopes) { 'write:mutes' }
- let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:other_account) { Fabricate(:account, username: 'bob') }
before do
user.account.follow!(other_account)
@@ -262,7 +262,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
describe 'POST #mute with notifications set to false' do
let(:scopes) { 'write:mutes' }
- let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:other_account) { Fabricate(:account, username: 'bob') }
before do
user.account.follow!(other_account)
@@ -290,7 +290,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
describe 'POST #mute with nonzero duration set' do
let(:scopes) { 'write:mutes' }
- let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:other_account) { Fabricate(:account, username: 'bob') }
before do
user.account.follow!(other_account)
@@ -318,7 +318,7 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
describe 'POST #unmute' do
let(:scopes) { 'write:mutes' }
- let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:other_account) { Fabricate(:account, username: 'bob') }
before do
user.account.mute!(other_account)
diff --git a/spec/controllers/api/v1/admin/account_actions_controller_spec.rb b/spec/controllers/api/v1/admin/account_actions_controller_spec.rb
index a5a8f4bb0d3b64f85cda638a3f94c650ac9a7dac..601290b8244c04888448a75fd21b931d0726b5c3 100644
--- a/spec/controllers/api/v1/admin/account_actions_controller_spec.rb
+++ b/spec/controllers/api/v1/admin/account_actions_controller_spec.rb
@@ -4,10 +4,10 @@ RSpec.describe Api::V1::Admin::AccountActionsController, type: :controller do
render_views
let(:role) { 'moderator' }
- let(:user) { Fabricate(:user, role: role, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user, role: role) }
let(:scopes) { 'admin:read admin:write' }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
- let(:account) { Fabricate(:user).account }
+ let(:account) { Fabricate(:account) }
before do
allow(controller).to receive(:doorkeeper_token) { token }
diff --git a/spec/controllers/api/v1/admin/accounts_controller_spec.rb b/spec/controllers/api/v1/admin/accounts_controller_spec.rb
index f6be35f7f10036b79a7a4c5f73d317a597220a28..bf79ee520277f237aee6d8b6128a8ef62b1c3a6b 100644
--- a/spec/controllers/api/v1/admin/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/admin/accounts_controller_spec.rb
@@ -4,10 +4,10 @@ RSpec.describe Api::V1::Admin::AccountsController, type: :controller do
render_views
let(:role) { 'moderator' }
- let(:user) { Fabricate(:user, role: role, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user, role: role) }
let(:scopes) { 'admin:read admin:write' }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
- let(:account) { Fabricate(:user).account }
+ let(:account) { Fabricate(:account) }
before do
allow(controller).to receive(:doorkeeper_token) { token }
diff --git a/spec/controllers/api/v1/admin/reports_controller_spec.rb b/spec/controllers/api/v1/admin/reports_controller_spec.rb
index 4ed3c5dc4c456f53f85aeab1bf06994bdaabca0d..b6df53048a66bb9fa8fb9b8e828d5b161227d410 100644
--- a/spec/controllers/api/v1/admin/reports_controller_spec.rb
+++ b/spec/controllers/api/v1/admin/reports_controller_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe Api::V1::Admin::ReportsController, type: :controller do
render_views
let(:role) { 'moderator' }
- let(:user) { Fabricate(:user, role: role, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user, role: role) }
let(:scopes) { 'admin:read admin:write' }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
let(:report) { Fabricate(:report) }
diff --git a/spec/controllers/api/v1/blocks_controller_spec.rb b/spec/controllers/api/v1/blocks_controller_spec.rb
index 818f76c92352d77151c39ef21901eb3a94f19ee4..0e5c8296d8bc158fa91264463d4cc236bfdca93b 100644
--- a/spec/controllers/api/v1/blocks_controller_spec.rb
+++ b/spec/controllers/api/v1/blocks_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
RSpec.describe Api::V1::BlocksController, type: :controller do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:scopes) { 'read:blocks' }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
diff --git a/spec/controllers/api/v1/conversations_controller_spec.rb b/spec/controllers/api/v1/conversations_controller_spec.rb
index 070f65061b5239fd2a6d94837abcfa8a53d8a88e..5add7cf1d4214f791d5859fe0fa29cef891660e9 100644
--- a/spec/controllers/api/v1/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/conversations_controller_spec.rb
@@ -3,9 +3,9 @@ require 'rails_helper'
RSpec.describe Api::V1::ConversationsController, type: :controller do
render_views
- let!(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let!(:user) { Fabricate(:user, account_attributes: { username: 'alice' }) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
- let(:other) { Fabricate(:user, account: Fabricate(:account, username: 'bob')) }
+ let(:other) { Fabricate(:user) }
before do
allow(controller).to receive(:doorkeeper_token) { token }
diff --git a/spec/controllers/api/v1/domain_blocks_controller_spec.rb b/spec/controllers/api/v1/domain_blocks_controller_spec.rb
index 6a7a35c7a5158d23ffbe3b30df564987d47263bd..d9dc1bdbfe5829170c526e211cefef4dd176ed1c 100644
--- a/spec/controllers/api/v1/domain_blocks_controller_spec.rb
+++ b/spec/controllers/api/v1/domain_blocks_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
RSpec.describe Api::V1::DomainBlocksController, type: :controller do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
before do
diff --git a/spec/controllers/api/v1/follow_requests_controller_spec.rb b/spec/controllers/api/v1/follow_requests_controller_spec.rb
index 1034faa323375442b3326e7058d05bb9f3a94b63..856ba2a1c01a74c1bee58eb059154a2e7ebc7003 100644
--- a/spec/controllers/api/v1/follow_requests_controller_spec.rb
+++ b/spec/controllers/api/v1/follow_requests_controller_spec.rb
@@ -3,9 +3,9 @@ require 'rails_helper'
RSpec.describe Api::V1::FollowRequestsController, type: :controller do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice', locked: true)) }
+ let(:user) { Fabricate(:user, account_attributes: { locked: true }) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
- let(:follower) { Fabricate(:account, username: 'bob') }
+ let(:follower) { Fabricate(:account) }
before do
FollowService.new.call(follower, user.account)
diff --git a/spec/controllers/api/v1/instances_controller_spec.rb b/spec/controllers/api/v1/instances_controller_spec.rb
index 7397d25d6bfebff6bf78db61d881421a5fc7d999..842669d96558aaaecb35eede1b4461819c0b3483 100644
--- a/spec/controllers/api/v1/instances_controller_spec.rb
+++ b/spec/controllers/api/v1/instances_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
RSpec.describe Api::V1::InstancesController, type: :controller do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id) }
before do
diff --git a/spec/controllers/api/v1/lists/accounts_controller_spec.rb b/spec/controllers/api/v1/lists/accounts_controller_spec.rb
index 08c22de5687e4d93641ea5c6becca46bee976534..526d8b5616ae92434b5f4f8ca1a52a9a633b10ce 100644
--- a/spec/controllers/api/v1/lists/accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/lists/accounts_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
describe Api::V1::Lists::AccountsController do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
let(:list) { Fabricate(:list, account: user.account) }
diff --git a/spec/controllers/api/v1/lists_controller_spec.rb b/spec/controllers/api/v1/lists_controller_spec.rb
index e92213789a306c95acee70026c7ab948437df709..71a8094e68b91833513242c30bd0ce2c89a03f8c 100644
--- a/spec/controllers/api/v1/lists_controller_spec.rb
+++ b/spec/controllers/api/v1/lists_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
RSpec.describe Api::V1::ListsController, type: :controller do
render_views
- let!(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let!(:user) { Fabricate(:user) }
let!(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
let!(:list) { Fabricate(:list, account: user.account) }
diff --git a/spec/controllers/api/v1/markers_controller_spec.rb b/spec/controllers/api/v1/markers_controller_spec.rb
index 556a75b9b1a0fb8cbe508316e793e6fa3b680608..ba0f3c32218857ce5e9534c9b5f1f64e83e96ead 100644
--- a/spec/controllers/api/v1/markers_controller_spec.rb
+++ b/spec/controllers/api/v1/markers_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
RSpec.describe Api::V1::MarkersController, type: :controller do
render_views
- let!(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let!(:user) { Fabricate(:user) }
let!(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses write:statuses') }
before { allow(controller).to receive(:doorkeeper_token) { token } }
diff --git a/spec/controllers/api/v1/media_controller_spec.rb b/spec/controllers/api/v1/media_controller_spec.rb
index 3eb015a1ca42fdf62f651dfd00ad960cf83a3fdb..d8d73263027e26cde4c243502d806ed282c144c2 100644
--- a/spec/controllers/api/v1/media_controller_spec.rb
+++ b/spec/controllers/api/v1/media_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
RSpec.describe Api::V1::MediaController, type: :controller do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:media') }
before do
diff --git a/spec/controllers/api/v1/mutes_controller_spec.rb b/spec/controllers/api/v1/mutes_controller_spec.rb
index a2b814a690d43b95d94194ad5a04a55a16d12faf..8176815d4e371fe7ad4848efe64a9a9e049918c9 100644
--- a/spec/controllers/api/v1/mutes_controller_spec.rb
+++ b/spec/controllers/api/v1/mutes_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
RSpec.describe Api::V1::MutesController, type: :controller do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:scopes) { 'read:mutes' }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
diff --git a/spec/controllers/api/v1/notifications_controller_spec.rb b/spec/controllers/api/v1/notifications_controller_spec.rb
index 5a0b24bbf8c7f23c6b3ec92091b0d1c8f96f4342..f8df6589f1fe9fb3b57bee4a699ccff4ea7bf4ff 100644
--- a/spec/controllers/api/v1/notifications_controller_spec.rb
+++ b/spec/controllers/api/v1/notifications_controller_spec.rb
@@ -3,10 +3,10 @@ require 'rails_helper'
RSpec.describe Api::V1::NotificationsController, type: :controller do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user, account_attributes: { username: 'alice' }) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
- let(:other) { Fabricate(:user, account: Fabricate(:account, username: 'bob')) }
- let(:third) { Fabricate(:user, account: Fabricate(:account, username: 'carol')) }
+ let(:other) { Fabricate(:user) }
+ let(:third) { Fabricate(:user) }
before do
allow(controller).to receive(:doorkeeper_token) { token }
diff --git a/spec/controllers/api/v1/polls/votes_controller_spec.rb b/spec/controllers/api/v1/polls/votes_controller_spec.rb
index 0ee3aa040c49418e03ccc04c8dc0ba6e1d7b5c6c..d7a9c197040455325b6528712bed1b83d31511dc 100644
--- a/spec/controllers/api/v1/polls/votes_controller_spec.rb
+++ b/spec/controllers/api/v1/polls/votes_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
RSpec.describe Api::V1::Polls::VotesController, type: :controller do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:scopes) { 'write:statuses' }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
diff --git a/spec/controllers/api/v1/polls_controller_spec.rb b/spec/controllers/api/v1/polls_controller_spec.rb
index 851bccb7e2dce400ade477eb9caad1bf47ad609b..f0d9eaf92d17b841115087fc0062c252f9f52a10 100644
--- a/spec/controllers/api/v1/polls_controller_spec.rb
+++ b/spec/controllers/api/v1/polls_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
RSpec.describe Api::V1::PollsController, type: :controller do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:scopes) { 'read:statuses' }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
diff --git a/spec/controllers/api/v1/reports_controller_spec.rb b/spec/controllers/api/v1/reports_controller_spec.rb
index a3596cf8a0387640c4deca777327d3ac3f6f2e21..a13de13706b00bcf63f937cbe40e16ba4ef27181 100644
--- a/spec/controllers/api/v1/reports_controller_spec.rb
+++ b/spec/controllers/api/v1/reports_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
RSpec.describe Api::V1::ReportsController, type: :controller do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
before do
diff --git a/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb b/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb
index 7c75a4f7383d4bb1833628d0851c348120bf954f..46d7b6c0a53b972881ec1806a6e2205197efddbd 100644
--- a/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/bookmarks_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
describe Api::V1::Statuses::BookmarksController do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:bookmarks', application: app) }
diff --git a/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb b/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb
index f053ae573858e4a02a9baa09c61a8c89f15b46d8..439a4738df56b6ea2a518ae50b8a6d11d14d62ee 100644
--- a/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/favourited_by_accounts_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
RSpec.describe Api::V1::Statuses::FavouritedByAccountsController, type: :controller do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: app, scopes: 'read:accounts') }
let(:alice) { Fabricate(:account) }
diff --git a/spec/controllers/api/v1/statuses/favourites_controller_spec.rb b/spec/controllers/api/v1/statuses/favourites_controller_spec.rb
index 4716ecae3c34fe917a3a85d3a0ef147eba9c791b..609957e3efa16165224613f1a12474fc203b4752 100644
--- a/spec/controllers/api/v1/statuses/favourites_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/favourites_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
describe Api::V1::Statuses::FavouritesController do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:favourites', application: app) }
diff --git a/spec/controllers/api/v1/statuses/histories_controller_spec.rb b/spec/controllers/api/v1/statuses/histories_controller_spec.rb
index 8d9d6a35916bce5edf74a03952241e07271beabd..00677f1d2c37c6c96e67d3b37796931e230d45c4 100644
--- a/spec/controllers/api/v1/statuses/histories_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/histories_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
describe Api::V1::Statuses::HistoriesController do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses', application: app) }
diff --git a/spec/controllers/api/v1/statuses/mutes_controller_spec.rb b/spec/controllers/api/v1/statuses/mutes_controller_spec.rb
index 966398580d68a194da31b0122f79e946ffba9aea..bffa9fe0d9c6a5e17fa000d9086a6a7178b2542d 100644
--- a/spec/controllers/api/v1/statuses/mutes_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/mutes_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
describe Api::V1::Statuses::MutesController do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:mutes', application: app) }
diff --git a/spec/controllers/api/v1/statuses/pins_controller_spec.rb b/spec/controllers/api/v1/statuses/pins_controller_spec.rb
index 13405d285d29ea1a326900b566a517ccfe2e1aac..8bdaf8b548a88cbd1c78d4ae3aa6f7511473de4b 100644
--- a/spec/controllers/api/v1/statuses/pins_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/pins_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
describe Api::V1::Statuses::PinsController do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:accounts', application: app) }
diff --git a/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb b/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb
index 60908b7b380d8d6db58e156b38c92223410d3423..31320349df07eb8aa37de3b5d5f46f3a3f4312c0 100644
--- a/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/reblogged_by_accounts_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
RSpec.describe Api::V1::Statuses::RebloggedByAccountsController, type: :controller do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: app, scopes: 'read:accounts') }
let(:alice) { Fabricate(:account) }
diff --git a/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb b/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
index f1d3d949c4a7d31841d058b2d7d46e51b3bb09ae..6eac02b232db18098b5680e120a7e59cbe0c4f71 100644
--- a/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/reblogs_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
describe Api::V1::Statuses::ReblogsController do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'write:statuses', application: app) }
diff --git a/spec/controllers/api/v1/statuses/sources_controller_spec.rb b/spec/controllers/api/v1/statuses/sources_controller_spec.rb
index 293c90ec9cffc33b6c1886f17a04566d485f6717..fbe6fa0be6cbc117152e8d71182a8b684524841d 100644
--- a/spec/controllers/api/v1/statuses/sources_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses/sources_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
describe Api::V1::Statuses::SourcesController do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:statuses', application: app) }
diff --git a/spec/controllers/api/v1/statuses_controller_spec.rb b/spec/controllers/api/v1/statuses_controller_spec.rb
index df803703851a00b6b462196a8829850045f088ae..2679ab017ec69618d5b74d41d51a917cefca962a 100644
--- a/spec/controllers/api/v1/statuses_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
RSpec.describe Api::V1::StatusesController, type: :controller do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:app) { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: app, scopes: scopes) }
diff --git a/spec/controllers/api/v1/timelines/home_controller_spec.rb b/spec/controllers/api/v1/timelines/home_controller_spec.rb
index e953e46495326b6651fb0c6a8f2282c11a8a3b89..131c2d92fa4d6cc0226a73840c4abf02d5cf5481 100644
--- a/spec/controllers/api/v1/timelines/home_controller_spec.rb
+++ b/spec/controllers/api/v1/timelines/home_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
describe Api::V1::Timelines::HomeController do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice'), current_sign_in_at: 1.day.ago) }
+ let(:user) { Fabricate(:user, current_sign_in_at: 1.day.ago) }
before do
allow(controller).to receive(:doorkeeper_token) { token }
diff --git a/spec/controllers/api/v1/timelines/list_controller_spec.rb b/spec/controllers/api/v1/timelines/list_controller_spec.rb
index 45e4bf34c86e807db9d431eb5c9ddb8fec9f35fd..526c66a0581b309ce4457eeea88ff2f508293c22 100644
--- a/spec/controllers/api/v1/timelines/list_controller_spec.rb
+++ b/spec/controllers/api/v1/timelines/list_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
describe Api::V1::Timelines::ListController do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:list) { Fabricate(:list, account: user.account) }
before do
@@ -30,7 +30,7 @@ describe Api::V1::Timelines::ListController do
end
context 'with the wrong user context' do
- let(:other_user) { Fabricate(:user, account: Fabricate(:account, username: 'bob')) }
+ let(:other_user) { Fabricate(:user) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: other_user.id, scopes: 'read') }
describe 'GET #show' do
diff --git a/spec/controllers/api/v1/timelines/public_controller_spec.rb b/spec/controllers/api/v1/timelines/public_controller_spec.rb
index 737aedba6fd03afaf4622b3cfb21ee0ae4bd0e50..31e594d22b122d78253c018ca60c28f2c2fbdfe7 100644
--- a/spec/controllers/api/v1/timelines/public_controller_spec.rb
+++ b/spec/controllers/api/v1/timelines/public_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
describe Api::V1::Timelines::PublicController do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
before do
allow(controller).to receive(:doorkeeper_token) { token }
diff --git a/spec/controllers/api/v1/timelines/tag_controller_spec.rb b/spec/controllers/api/v1/timelines/tag_controller_spec.rb
index f71ca2a399d2310031a1d91ca433161fafa2e130..718911083362de7902a6726568837e6aea9fdb51 100644
--- a/spec/controllers/api/v1/timelines/tag_controller_spec.rb
+++ b/spec/controllers/api/v1/timelines/tag_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
describe Api::V1::Timelines::TagController do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
before do
allow(controller).to receive(:doorkeeper_token) { token }
diff --git a/spec/controllers/api/v2/search_controller_spec.rb b/spec/controllers/api/v2/search_controller_spec.rb
index 8ee8753ded5b1dd5e4d2d0cf2f3c1b2414f3c3a9..fa20e1e51fe9feb87ca7ab0000b89bd1cf0cdcd9 100644
--- a/spec/controllers/api/v2/search_controller_spec.rb
+++ b/spec/controllers/api/v2/search_controller_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
RSpec.describe Api::V2::SearchController, type: :controller do
render_views
- let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:user) { Fabricate(:user) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:search') }
before do
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index 458298a6b9ec53b9a2c1b9daf1e3d56c8819c78f..0fb4ddbcf5c211182e3980fb759c4753d2d97ce4 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -49,7 +49,7 @@ describe ApplicationController, type: :controller do
it 'returns account if signed in' do
account = Fabricate(:account)
- sign_in(Fabricate(:user, account: account))
+ sign_in(account.user)
expect(controller.view_context.current_account).to eq account
end
end
@@ -164,13 +164,13 @@ describe ApplicationController, type: :controller do
end
it 'does nothing if user who signed in is not suspended' do
- sign_in(Fabricate(:user, account: Fabricate(:account, suspended: false)))
+ sign_in(Fabricate(:account, suspended: false).user)
get 'success'
expect(response).to have_http_status(200)
end
it 'redirects to account status page' do
- sign_in(Fabricate(:user, account: Fabricate(:account, suspended: true)))
+ sign_in(Fabricate(:account, suspended: true).user)
get 'success'
expect(response).to redirect_to(edit_user_registration_path)
end
diff --git a/spec/controllers/auth/registrations_controller_spec.rb b/spec/controllers/auth/registrations_controller_spec.rb
index ccf304a930ec2993a7b3eac91049583f48eb6aef..0ebf6641fa478b4ba0ea9f3fbcbdd2e71458f059 100644
--- a/spec/controllers/auth/registrations_controller_spec.rb
+++ b/spec/controllers/auth/registrations_controller_spec.rb
@@ -228,7 +228,7 @@ RSpec.describe Auth::RegistrationsController, type: :controller do
end
it 'does nothing if user already exists' do
- Fabricate(:user, account: Fabricate(:account, username: 'test'))
+ Fabricate(:account, username: 'test')
subject
end
diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb
index 2368cc2bfb981c9463166d089f84acdef70cebb9..64ec7b794633904d2bc16757f891e16723f13307 100644
--- a/spec/controllers/auth/sessions_controller_spec.rb
+++ b/spec/controllers/auth/sessions_controller_spec.rb
@@ -37,8 +37,11 @@ RSpec.describe Auth::SessionsController, type: :controller do
end
context 'with a suspended user' do
+ before do
+ user.account.suspend!
+ end
+
it 'redirects to home after sign out' do
- Fabricate(:account, user: user, suspended: true)
sign_in(user, scope: :user)
delete :destroy
@@ -78,8 +81,8 @@ RSpec.describe Auth::SessionsController, type: :controller do
end
context 'using a valid email and existing user' do
- let(:user) do
- account = Fabricate.build(:account, username: 'pam_user1')
+ let!(:user) do
+ account = Fabricate.build(:account, username: 'pam_user1', user: nil)
account.save!(validate: false)
user = Fabricate(:user, email: 'pam@example.com', password: nil, account: account, external: true)
user
diff --git a/spec/controllers/authorize_interactions_controller_spec.rb b/spec/controllers/authorize_interactions_controller_spec.rb
index b4ce30cd7fe302375cb9081758615b30da6bf657..99f3f6ffc622132d0fa5cad69c202f6c388edc77 100644
--- a/spec/controllers/authorize_interactions_controller_spec.rb
+++ b/spec/controllers/authorize_interactions_controller_spec.rb
@@ -16,7 +16,6 @@ describe AuthorizeInteractionsController do
describe 'when signed in' do
let(:user) { Fabricate(:user) }
- let(:account) { Fabricate(:account, user: user) }
before do
sign_in(user)
@@ -76,7 +75,7 @@ describe AuthorizeInteractionsController do
describe 'when signed in' do
let!(:user) { Fabricate(:user) }
- let!(:account) { user.account }
+ let(:account) { user.account }
before do
sign_in(user)
diff --git a/spec/controllers/concerns/account_controller_concern_spec.rb b/spec/controllers/concerns/account_controller_concern_spec.rb
index 7ea214a7d3fb5fd243e1bfdc572d4527d834d14a..8356454146b13b011a16a33880aaac40000bf7a4 100644
--- a/spec/controllers/concerns/account_controller_concern_spec.rb
+++ b/spec/controllers/concerns/account_controller_concern_spec.rb
@@ -17,7 +17,7 @@ describe ApplicationController, type: :controller do
context 'when account is suspended' do
it 'returns http gone' do
- account = Fabricate(:account, suspended: true, user: Fabricate(:user))
+ account = Fabricate(:account, suspended: true)
get 'success', params: { account_username: account.username }
expect(response).to have_http_status(410)
end
@@ -33,19 +33,19 @@ describe ApplicationController, type: :controller do
context 'when account is not suspended' do
it 'assigns @account' do
- account = Fabricate(:account, user: Fabricate(:user))
+ account = Fabricate(:account)
get 'success', params: { account_username: account.username }
expect(assigns(:account)).to eq account
end
it 'sets link headers' do
- account = Fabricate(:account, username: 'username', user: Fabricate(:user))
+ account = Fabricate(:account, username: 'username')
get 'success', params: { account_username: 'username' }
expect(response.headers['Link'].to_s).to eq '<http://test.host/.well-known/webfinger?resource=acct%3Ausername%40cb6e6126.ngrok.io>; rel="lrdd"; type="application/jrd+json", <https://cb6e6126.ngrok.io/users/username>; rel="alternate"; type="application/activity+json"'
end
it 'returns http success' do
- account = Fabricate(:account, user: Fabricate(:user))
+ account = Fabricate(:account)
get 'success', params: { account_username: account.username }
expect(response).to have_http_status(200)
end
diff --git a/spec/controllers/concerns/accountable_concern_spec.rb b/spec/controllers/concerns/accountable_concern_spec.rb
index e3c06b4947953c1c8e5f5c484613f8149e06ecf0..5c5180bc24cf013789e5f351dd1b69f3972e8ee2 100644
--- a/spec/controllers/concerns/accountable_concern_spec.rb
+++ b/spec/controllers/concerns/accountable_concern_spec.rb
@@ -12,14 +12,14 @@ RSpec.describe AccountableConcern do
end
end
- let(:user) { Fabricate(:user, account: Fabricate(:account)) }
- let(:target) { Fabricate(:user, account: Fabricate(:account)) }
- let(:hoge) { Hoge.new(user.account) }
+ let(:user) { Fabricate(:account) }
+ let(:target) { Fabricate(:account) }
+ let(:hoge) { Hoge.new(user) }
describe '#log_action' do
it 'creates Admin::ActionLog' do
expect do
- hoge.log_action(:create, target.account)
+ hoge.log_action(:create, target)
end.to change { Admin::ActionLog.count }.by(1)
end
end
diff --git a/spec/controllers/follower_accounts_controller_spec.rb b/spec/controllers/follower_accounts_controller_spec.rb
index 006274169109f9bba962d92159c6edfa30c9185d..eb095cf30cd36d20fa63eb777f83316be4603b8c 100644
--- a/spec/controllers/follower_accounts_controller_spec.rb
+++ b/spec/controllers/follower_accounts_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
describe FollowerAccountsController do
render_views
- let(:alice) { Fabricate(:user).account }
+ let(:alice) { Fabricate(:account) }
let(:follower0) { Fabricate(:account) }
let(:follower1) { Fabricate(:account) }
diff --git a/spec/controllers/following_accounts_controller_spec.rb b/spec/controllers/following_accounts_controller_spec.rb
index 7ec0e3d0699e1d6e0a5e9dab396601bad6f3e7d3..af5ce07870973c32111f93b5be629e3a0498a8e1 100644
--- a/spec/controllers/following_accounts_controller_spec.rb
+++ b/spec/controllers/following_accounts_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
describe FollowingAccountsController do
render_views
- let(:alice) { Fabricate(:user).account }
+ let(:alice) { Fabricate(:account) }
let(:followee0) { Fabricate(:account) }
let(:followee1) { Fabricate(:account) }
diff --git a/spec/controllers/settings/deletes_controller_spec.rb b/spec/controllers/settings/deletes_controller_spec.rb
index 92ab401c964ad249036179c8402089f266a37af9..cd36ecc35e3e674f391f08a71972b68d2f80adc5 100644
--- a/spec/controllers/settings/deletes_controller_spec.rb
+++ b/spec/controllers/settings/deletes_controller_spec.rb
@@ -17,7 +17,7 @@ describe Settings::DeletesController do
end
context 'when suspended' do
- let(:user) { Fabricate(:user, account_attributes: { username: 'alice', suspended_at: Time.now.utc }) }
+ let(:user) { Fabricate(:user, account_attributes: { suspended_at: Time.now.utc }) }
it 'returns http forbidden' do
get :show
@@ -64,7 +64,7 @@ describe Settings::DeletesController do
end
context 'when suspended' do
- let(:user) { Fabricate(:user, account_attributes: { username: 'alice', suspended_at: Time.now.utc }) }
+ let(:user) { Fabricate(:user, account_attributes: { suspended_at: Time.now.utc }) }
it 'returns http forbidden' do
expect(response).to have_http_status(403)
diff --git a/spec/controllers/settings/migrations_controller_spec.rb b/spec/controllers/settings/migrations_controller_spec.rb
index 048d9de8d2ebd6493da4ae3df5787cdecaae7447..35c5747a061f4ad01c02435f888eed04ddf32823 100644
--- a/spec/controllers/settings/migrations_controller_spec.rb
+++ b/spec/controllers/settings/migrations_controller_spec.rb
@@ -19,8 +19,7 @@ describe Settings::MigrationsController do
context 'when user is sign in' do
subject { get :show }
- let(:user) { Fabricate(:user, account: account) }
- let(:account) { Fabricate(:account, moved_to_account: moved_to_account) }
+ let(:user) { Fabricate(:account, moved_to_account: moved_to_account).user }
before { sign_in user, scope: :user }
diff --git a/spec/controllers/settings/profiles_controller_spec.rb b/spec/controllers/settings/profiles_controller_spec.rb
index 1ac286254f3365ddc80405ed0888fd8b9419937f..ee3aec8156530900bc4793d17de02652c75a884e 100644
--- a/spec/controllers/settings/profiles_controller_spec.rb
+++ b/spec/controllers/settings/profiles_controller_spec.rb
@@ -3,9 +3,11 @@ require 'rails_helper'
RSpec.describe Settings::ProfilesController, type: :controller do
render_views
+ let!(:user) { Fabricate(:user) }
+ let(:account) { user.account }
+
before do
- @user = Fabricate(:user)
- sign_in @user, scope: :user
+ sign_in user, scope: :user
end
describe "GET #show" do
@@ -16,10 +18,12 @@ RSpec.describe Settings::ProfilesController, type: :controller do
end
describe 'PUT #update' do
+ before do
+ user.account.update(display_name: 'Old name')
+ end
+
it 'updates the user profile' do
allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
- account = Fabricate(:account, user: @user, display_name: 'Old name')
-
put :update, params: { account: { display_name: 'New name' } }
expect(account.reload.display_name).to eq 'New name'
expect(response).to redirect_to(settings_profile_path)
@@ -30,7 +34,6 @@ RSpec.describe Settings::ProfilesController, type: :controller do
describe 'PUT #update with new profile image' do
it 'updates profile image' do
allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
- account = Fabricate(:account, user: @user, display_name: 'AvatarTest')
expect(account.avatar.instance.avatar_file_name).to be_nil
put :update, params: { account: { avatar: fixture_file_upload('avatar.gif', 'image/gif') } }
@@ -43,7 +46,6 @@ RSpec.describe Settings::ProfilesController, type: :controller do
describe 'PUT #update with oversized image' do
it 'gives the user an error message' do
allow(ActivityPub::UpdateDistributionWorker).to receive(:perform_async)
- account = Fabricate(:account, user: @user, display_name: 'AvatarTest')
put :update, params: { account: { avatar: fixture_file_upload('4096x4097.png', 'image/png') } }
expect(response.body).to include('images are not supported')
end
diff --git a/spec/fabricators/account_fabricator.rb b/spec/fabricators/account_fabricator.rb
index ab900c5fa03edbb5499bacf173bdcc440f21b440..f1cce281ca48c63142fd6110b1cca9fa93abf84c 100644
--- a/spec/fabricators/account_fabricator.rb
+++ b/spec/fabricators/account_fabricator.rb
@@ -10,4 +10,5 @@ Fabricator(:account) do
private_key { private_key }
suspended_at { |attrs| attrs[:suspended] ? Time.now.utc : nil }
silenced_at { |attrs| attrs[:silenced] ? Time.now.utc : nil }
+ user { |attrs| attrs[:domain].nil? ? Fabricate.build(:user, account: nil) : nil }
end
diff --git a/spec/fabricators/user_fabricator.rb b/spec/fabricators/user_fabricator.rb
index 8f59565016dcdc5e8c42f04eb3d713a467c90b7d..10ad2c53a30df45cda667b5e47ddeba1c667c07c 100644
--- a/spec/fabricators/user_fabricator.rb
+++ b/spec/fabricators/user_fabricator.rb
@@ -1,5 +1,5 @@
Fabricator(:user) do
- account
+ account { Fabricate.build(:account, user: nil) }
email { sequence(:email) { |i| "#{i}#{Faker::Internet.email}" } }
password "123456789"
confirmed_at { Time.zone.now }
diff --git a/spec/mailers/admin_mailer_spec.rb b/spec/mailers/admin_mailer_spec.rb
index 4a8ef7b5eaee23ffa602ad4bf63517f36307fbbb..29fb586a3436641262247720c4b31a0d568ee8d1 100644
--- a/spec/mailers/admin_mailer_spec.rb
+++ b/spec/mailers/admin_mailer_spec.rb
@@ -4,11 +4,15 @@ require 'rails_helper'
RSpec.describe AdminMailer, type: :mailer do
describe '.new_report' do
- let(:sender) { Fabricate(:account, username: 'John', user: Fabricate(:user)) }
- let(:recipient) { Fabricate(:account, username: 'Mike', user: Fabricate(:user, locale: :en)) }
+ let(:sender) { Fabricate(:account, username: 'John') }
+ let(:recipient) { Fabricate(:account, username: 'Mike') }
let(:report) { Fabricate(:report, account: sender, target_account: recipient) }
let(:mail) { described_class.new_report(recipient, report) }
+ before do
+ recipient.user.update(locale: :en)
+ end
+
it 'renders the headers' do
expect(mail.subject).to eq("New report for cb6e6126.ngrok.io (##{report.id})")
expect(mail.to).to eq [recipient.user_email]
diff --git a/spec/mailers/notification_mailer_spec.rb b/spec/mailers/notification_mailer_spec.rb
index 9b645bad892bc9f7e8ae46bb4a48d1d8e70f4bf4..2ca4e26fa8b6f55310778e391ac9bedb1282f779 100644
--- a/spec/mailers/notification_mailer_spec.rb
+++ b/spec/mailers/notification_mailer_spec.rb
@@ -1,7 +1,7 @@
require "rails_helper"
RSpec.describe NotificationMailer, type: :mailer do
- let(:receiver) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
+ let(:receiver) { Fabricate(:user) }
let(:sender) { Fabricate(:account, username: 'bob') }
let(:foreign_status) { Fabricate(:status, account: sender, text: 'The body of the foreign status') }
let(:own_status) { Fabricate(:status, account: receiver.account, text: 'The body of the own status') }
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 65e6714c0e7edf9c91d489a207b0f70d1b29c17f..681134d498aec923056e5f47316f0005b57507c5 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Account, type: :model do
end
context 'when the account is of a local user' do
- let!(:subject) { Fabricate(:account, user: Fabricate(:user, email: 'foo+bar@domain.org')) }
+ let!(:subject) { Fabricate(:user, email: 'foo+bar@domain.org').account }
it 'creates a canonical domain block' do
subject.suspend!
diff --git a/spec/models/admin/account_action_spec.rb b/spec/models/admin/account_action_spec.rb
index 2366b9ca4af23c8dfb1c21b8411ce4217b329423..809c7fc46dd435a936480e5bfe72fa1d90b128a4 100644
--- a/spec/models/admin/account_action_spec.rb
+++ b/spec/models/admin/account_action_spec.rb
@@ -5,8 +5,8 @@ RSpec.describe Admin::AccountAction, type: :model do
describe '#save!' do
subject { account_action.save! }
- let(:account) { Fabricate(:account, user: Fabricate(:user, admin: true)) }
- let(:target_account) { Fabricate(:account, user: Fabricate(:user)) }
+ let(:account) { Fabricate(:user, admin: true).account }
+ let(:target_account) { Fabricate(:account) }
let(:type) { 'disable' }
before do
diff --git a/spec/models/public_feed_spec.rb b/spec/models/public_feed_spec.rb
index 0392a582c69cd12d4363e3b83d763e204e308d9d..0ffc343f171625f0039130908750815e1d8fa174 100644
--- a/spec/models/public_feed_spec.rb
+++ b/spec/models/public_feed_spec.rb
@@ -31,7 +31,6 @@ RSpec.describe PublicFeed, type: :model do
end
it 'filters out silenced accounts' do
- account = Fabricate(:account)
silenced_account = Fabricate(:account, silenced: true)
status = Fabricate(:status, account: account)
silenced_status = Fabricate(:status, account: silenced_account)
@@ -176,8 +175,7 @@ RSpec.describe PublicFeed, type: :model do
context 'with language preferences' do
it 'excludes statuses in languages not allowed by the account user' do
- user = Fabricate(:user, chosen_languages: [:en, :es])
- @account.update(user: user)
+ @account.user.update(chosen_languages: [:en, :es])
en_status = Fabricate(:status, language: 'en')
es_status = Fabricate(:status, language: 'es')
fr_status = Fabricate(:status, language: 'fr')
@@ -188,8 +186,7 @@ RSpec.describe PublicFeed, type: :model do
end
it 'includes all languages when user does not have a setting' do
- user = Fabricate(:user, chosen_languages: nil)
- @account.update(user: user)
+ @account.user.update(chosen_languages: nil)
en_status = Fabricate(:status, language: 'en')
es_status = Fabricate(:status, language: 'es')
@@ -199,7 +196,8 @@ RSpec.describe PublicFeed, type: :model do
end
it 'includes all languages when account does not have a user' do
- expect(@account.user).to be_nil
+ @account.update(user: nil)
+
en_status = Fabricate(:status, language: 'en')
es_status = Fabricate(:status, language: 'es')
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 54bb6db7f96b71b4df597547dcd3a0b7d6d79974..406438c220e1b9c7c4f3cc5df9796a6e0f4c6bfc 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -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
diff --git a/spec/policies/account_moderation_note_policy_spec.rb b/spec/policies/account_moderation_note_policy_spec.rb
index bb7af94e45564c1952c53e329c9a1032667cf92a..39ec2008aecabd05d479204ef556eb016b74766f 100644
--- a/spec/policies/account_moderation_note_policy_spec.rb
+++ b/spec/policies/account_moderation_note_policy_spec.rb
@@ -6,7 +6,7 @@ require 'pundit/rspec'
RSpec.describe AccountModerationNotePolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
- let(:john) { Fabricate(:user).account }
+ let(:john) { Fabricate(:account) }
permissions :create? do
context 'staff' do
@@ -42,7 +42,7 @@ RSpec.describe AccountModerationNotePolicy do
end
context 'neither admin nor owner' do
- let(:kevin) { Fabricate(:user).account }
+ let(:kevin) { Fabricate(:account) }
it 'denies to destroy' do
expect(subject).to_not permit(kevin, account_moderation_note)
diff --git a/spec/policies/account_policy_spec.rb b/spec/policies/account_policy_spec.rb
index 8a5e62c06e9f2a972d2ed35417f059627e14dc4c..b55eb65a7963a60a97c7c327f5a818a34ca26f70 100644
--- a/spec/policies/account_policy_spec.rb
+++ b/spec/policies/account_policy_spec.rb
@@ -6,8 +6,8 @@ require 'pundit/rspec'
RSpec.describe AccountPolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
- let(:john) { Fabricate(:user).account }
- let(:alice) { Fabricate(:user).account }
+ let(:john) { Fabricate(:account) }
+ let(:alice) { Fabricate(:account) }
permissions :index? do
context 'staff' do
diff --git a/spec/policies/backup_policy_spec.rb b/spec/policies/backup_policy_spec.rb
index 80407e12f850de0ab7f99e9d28b8232daa80db9f..6b31c6f7c7f891bc7b756e5b4b34c3d93fd4fd6f 100644
--- a/spec/policies/backup_policy_spec.rb
+++ b/spec/policies/backup_policy_spec.rb
@@ -5,7 +5,7 @@ require 'pundit/rspec'
RSpec.describe BackupPolicy do
let(:subject) { described_class }
- let(:john) { Fabricate(:user).account }
+ let(:john) { Fabricate(:account) }
permissions :create? do
context 'not user_signed_in?' do
diff --git a/spec/policies/custom_emoji_policy_spec.rb b/spec/policies/custom_emoji_policy_spec.rb
index 8def88212fb41afbaf73bf083733f19521c8c463..e4f1af3c1b94a978a67162b0013ae757735327ae 100644
--- a/spec/policies/custom_emoji_policy_spec.rb
+++ b/spec/policies/custom_emoji_policy_spec.rb
@@ -6,7 +6,7 @@ require 'pundit/rspec'
RSpec.describe CustomEmojiPolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
- let(:john) { Fabricate(:user).account }
+ let(:john) { Fabricate(:account) }
permissions :index?, :enable?, :disable? do
context 'staff' do
diff --git a/spec/policies/domain_block_policy_spec.rb b/spec/policies/domain_block_policy_spec.rb
index aea50ec0fde33ebb2f6a2acd04c599105a981e64..b24ed9e3a326677b18025bcf8d0374c746c63d42 100644
--- a/spec/policies/domain_block_policy_spec.rb
+++ b/spec/policies/domain_block_policy_spec.rb
@@ -6,7 +6,7 @@ require 'pundit/rspec'
RSpec.describe DomainBlockPolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
- let(:john) { Fabricate(:user).account }
+ let(:john) { Fabricate(:account) }
permissions :index?, :show?, :create?, :destroy? do
context 'admin' do
diff --git a/spec/policies/email_domain_block_policy_spec.rb b/spec/policies/email_domain_block_policy_spec.rb
index a3e825e078942d1d67d1ac89c42bb55efc5403cc..1ff55af8e6b6bccee28717fcbd86fae4249989c5 100644
--- a/spec/policies/email_domain_block_policy_spec.rb
+++ b/spec/policies/email_domain_block_policy_spec.rb
@@ -6,7 +6,7 @@ require 'pundit/rspec'
RSpec.describe EmailDomainBlockPolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
- let(:john) { Fabricate(:user).account }
+ let(:john) { Fabricate(:account) }
permissions :index?, :create?, :destroy? do
context 'admin' do
diff --git a/spec/policies/instance_policy_spec.rb b/spec/policies/instance_policy_spec.rb
index 72cf25f5681e3a4764bf42b1731b5a8dec746971..71ef1fe5077fe16f99b3433d2d7d130b59299d16 100644
--- a/spec/policies/instance_policy_spec.rb
+++ b/spec/policies/instance_policy_spec.rb
@@ -6,7 +6,7 @@ require 'pundit/rspec'
RSpec.describe InstancePolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
- let(:john) { Fabricate(:user).account }
+ let(:john) { Fabricate(:account) }
permissions :index?, :show?, :destroy? do
context 'admin' do
diff --git a/spec/policies/invite_policy_spec.rb b/spec/policies/invite_policy_spec.rb
index e391455be3eb1f547f40ee6ddda8d8306084387d..122137804793137774f7e1023000b88907bfa7f2 100644
--- a/spec/policies/invite_policy_spec.rb
+++ b/spec/policies/invite_policy_spec.rb
@@ -6,7 +6,7 @@ require 'pundit/rspec'
RSpec.describe InvitePolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
- let(:john) { Fabricate(:user).account }
+ let(:john) { Fabricate(:account) }
permissions :index? do
context 'staff?' do
diff --git a/spec/policies/relay_policy_spec.rb b/spec/policies/relay_policy_spec.rb
index 640f27d5475eb9eb6ea50435f3f6f32e3fe35aca..139d945dc8ff8f6881dfdb8bc780790c51c2bfee 100644
--- a/spec/policies/relay_policy_spec.rb
+++ b/spec/policies/relay_policy_spec.rb
@@ -6,7 +6,7 @@ require 'pundit/rspec'
RSpec.describe RelayPolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
- let(:john) { Fabricate(:user).account }
+ let(:john) { Fabricate(:account) }
permissions :update? do
context 'admin?' do
diff --git a/spec/policies/report_note_policy_spec.rb b/spec/policies/report_note_policy_spec.rb
index 596d7d7a95fa07ca4fc35facdc1a5aa7c39ac4a1..c34f99b712dcaf4193b948fb22adcd599b2c2e55 100644
--- a/spec/policies/report_note_policy_spec.rb
+++ b/spec/policies/report_note_policy_spec.rb
@@ -6,7 +6,7 @@ require 'pundit/rspec'
RSpec.describe ReportNotePolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
- let(:john) { Fabricate(:user).account }
+ let(:john) { Fabricate(:account) }
permissions :create? do
context 'staff?' do
diff --git a/spec/policies/report_policy_spec.rb b/spec/policies/report_policy_spec.rb
index c9ae1e87a909e71f94b8ef6763fd02a07ff187c8..84c366d7f3e2f5afe95a5da004e050c6a2a747a3 100644
--- a/spec/policies/report_policy_spec.rb
+++ b/spec/policies/report_policy_spec.rb
@@ -6,7 +6,7 @@ require 'pundit/rspec'
RSpec.describe ReportPolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
- let(:john) { Fabricate(:user).account }
+ let(:john) { Fabricate(:account) }
permissions :update?, :index?, :show? do
context 'staff?' do
diff --git a/spec/policies/settings_policy_spec.rb b/spec/policies/settings_policy_spec.rb
index 92f1f4869a9e9da78de69f08baca284afaa1362e..3fa183c509d867f0225d90c4ea3bcd215360ad9c 100644
--- a/spec/policies/settings_policy_spec.rb
+++ b/spec/policies/settings_policy_spec.rb
@@ -6,7 +6,7 @@ require 'pundit/rspec'
RSpec.describe SettingsPolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
- let(:john) { Fabricate(:user).account }
+ let(:john) { Fabricate(:account) }
permissions :update?, :show? do
context 'admin?' do
diff --git a/spec/policies/tag_policy_spec.rb b/spec/policies/tag_policy_spec.rb
index c63875dc0888a6724db99043eb3537936d3ae55a..256e6786a30990542daddf269dfbfb39ddafbf82 100644
--- a/spec/policies/tag_policy_spec.rb
+++ b/spec/policies/tag_policy_spec.rb
@@ -6,7 +6,7 @@ require 'pundit/rspec'
RSpec.describe TagPolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
- let(:john) { Fabricate(:user).account }
+ let(:john) { Fabricate(:account) }
permissions :index?, :show?, :update? do
context 'staff?' do
diff --git a/spec/policies/user_policy_spec.rb b/spec/policies/user_policy_spec.rb
index e37904f048e618c8f789f82a7e130a4ac2919e51..1933ee014fb3349002385e32cb7ceba939949bcb 100644
--- a/spec/policies/user_policy_spec.rb
+++ b/spec/policies/user_policy_spec.rb
@@ -6,7 +6,7 @@ require 'pundit/rspec'
RSpec.describe UserPolicy do
let(:subject) { described_class }
let(:admin) { Fabricate(:user, admin: true).account }
- let(:john) { Fabricate(:user).account }
+ let(:john) { Fabricate(:account) }
permissions :reset_password?, :change_email? do
context 'staff?' do
diff --git a/spec/services/authorize_follow_service_spec.rb b/spec/services/authorize_follow_service_spec.rb
index 8e5d8fb03a0f7337c65a909994482b87a63e01f1..888d694b610ee6c1d300110bb1deeeccc1799adc 100644
--- a/spec/services/authorize_follow_service_spec.rb
+++ b/spec/services/authorize_follow_service_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe AuthorizeFollowService, type: :service do
subject { AuthorizeFollowService.new }
describe 'local' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:bob) { Fabricate(:account, username: 'bob') }
before do
FollowRequest.create(account: bob, target_account: sender)
@@ -23,7 +23,7 @@ RSpec.describe AuthorizeFollowService, type: :service do
end
describe 'remote ActivityPub' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob', domain: 'example.com', protocol: :activitypub, inbox_url: 'http://example.com/inbox')).account }
+ let(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com', protocol: :activitypub, inbox_url: 'http://example.com/inbox') }
before do
FollowRequest.create(account: bob, target_account: sender)
diff --git a/spec/services/batched_remove_status_service_spec.rb b/spec/services/batched_remove_status_service_spec.rb
index 4203952c60f313c17ef1c91e93885afbd7b69405..8f38908cd2c9d955efd368f3bc164a3a13f0a7da 100644
--- a/spec/services/batched_remove_status_service_spec.rb
+++ b/spec/services/batched_remove_status_service_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe BatchedRemoveStatusService, type: :service do
let!(:alice) { Fabricate(:account) }
let!(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com') }
- let!(:jeff) { Fabricate(:user).account }
+ let!(:jeff) { Fabricate(:account) }
let!(:hank) { Fabricate(:account, username: 'hank', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
let(:status1) { PostStatusService.new.call(alice, text: 'Hello @bob@example.com') }
diff --git a/spec/services/block_service_spec.rb b/spec/services/block_service_spec.rb
index 3714f09e9aca1fe595f420074dc8e8905ff0336a..a53e1f928856873f49d03ea0410b1a9ee7408115 100644
--- a/spec/services/block_service_spec.rb
+++ b/spec/services/block_service_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe BlockService, type: :service do
subject { BlockService.new }
describe 'local' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:bob) { Fabricate(:account, username: 'bob') }
before do
subject.call(sender, bob)
@@ -18,7 +18,7 @@ RSpec.describe BlockService, type: :service do
end
describe 'remote ActivityPub' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox')).account }
+ let(:bob) { Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
before do
stub_request(:post, 'http://example.com/inbox').to_return(status: 200)
diff --git a/spec/services/fan_out_on_write_service_spec.rb b/spec/services/fan_out_on_write_service_spec.rb
index 4ce110e457d962dc0fa647b0af650dcfec94da26..aaf179ce533baf625200dbf2f186d7697d6fd6b2 100644
--- a/spec/services/fan_out_on_write_service_spec.rb
+++ b/spec/services/fan_out_on_write_service_spec.rb
@@ -3,9 +3,9 @@ require 'rails_helper'
RSpec.describe FanOutOnWriteService, type: :service do
let(:last_active_at) { Time.now.utc }
- let!(:alice) { Fabricate(:user, current_sign_in_at: last_active_at, account: Fabricate(:account, username: 'alice')).account }
- let!(:bob) { Fabricate(:user, current_sign_in_at: last_active_at, account: Fabricate(:account, username: 'bob')).account }
- let!(:tom) { Fabricate(:user, current_sign_in_at: last_active_at, account: Fabricate(:account, username: 'tom')).account }
+ let!(:alice) { Fabricate(:user, current_sign_in_at: last_active_at).account }
+ let!(:bob) { Fabricate(:user, current_sign_in_at: last_active_at, account_attributes: { username: 'bob' }).account }
+ let!(:tom) { Fabricate(:user, current_sign_in_at: last_active_at).account }
subject { described_class.new }
diff --git a/spec/services/favourite_service_spec.rb b/spec/services/favourite_service_spec.rb
index fc7f58eb4244a6b8ae099c87a3ed3a1b1c83bdf5..94a8111dd5ca6674e265ff8e81ed2ad26a9da7ea 100644
--- a/spec/services/favourite_service_spec.rb
+++ b/spec/services/favourite_service_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe FavouriteService, type: :service do
subject { FavouriteService.new }
describe 'local' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:bob) { Fabricate(:account) }
let(:status) { Fabricate(:status, account: bob) }
before do
@@ -19,7 +19,7 @@ RSpec.describe FavouriteService, type: :service do
end
describe 'remote ActivityPub' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, protocol: :activitypub, username: 'bob', domain: 'example.com', inbox_url: 'http://example.com/inbox')).account }
+ let(:bob) { Fabricate(:account, protocol: :activitypub, username: 'bob', domain: 'example.com', inbox_url: 'http://example.com/inbox') }
let(:status) { Fabricate(:status, account: bob) }
before do
diff --git a/spec/services/follow_service_spec.rb b/spec/services/follow_service_spec.rb
index 63d6eb3bd8ef523617b795995ff45d11965b0fdb..02bc87c58d93cab8cc42aee5c14dda1bee5b5412 100644
--- a/spec/services/follow_service_spec.rb
+++ b/spec/services/follow_service_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe FollowService, type: :service do
context 'local account' do
describe 'locked account' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, locked: true, username: 'bob')).account }
+ let(:bob) { Fabricate(:account, locked: true, username: 'bob') }
before do
subject.call(sender, bob)
@@ -19,7 +19,7 @@ RSpec.describe FollowService, type: :service do
end
describe 'locked account, no reblogs' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, locked: true, username: 'bob')).account }
+ let(:bob) { Fabricate(:account, locked: true, username: 'bob') }
before do
subject.call(sender, bob, reblogs: false)
@@ -31,7 +31,7 @@ RSpec.describe FollowService, type: :service do
end
describe 'unlocked account, from silenced account' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:bob) { Fabricate(:account, username: 'bob') }
before do
sender.touch(:silenced_at)
@@ -44,7 +44,7 @@ RSpec.describe FollowService, type: :service do
end
describe 'unlocked account, from a muted account' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:bob) { Fabricate(:account, username: 'bob') }
before do
bob.mute!(sender)
@@ -58,7 +58,7 @@ RSpec.describe FollowService, type: :service do
end
describe 'unlocked account' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:bob) { Fabricate(:account, username: 'bob') }
before do
subject.call(sender, bob)
@@ -71,7 +71,7 @@ RSpec.describe FollowService, type: :service do
end
describe 'unlocked account, no reblogs' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:bob) { Fabricate(:account, username: 'bob') }
before do
subject.call(sender, bob, reblogs: false)
@@ -84,7 +84,7 @@ RSpec.describe FollowService, type: :service do
end
describe 'already followed account' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:bob) { Fabricate(:account, username: 'bob') }
before do
sender.follow!(bob)
@@ -97,7 +97,7 @@ RSpec.describe FollowService, type: :service do
end
describe 'already followed account, turning reblogs off' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:bob) { Fabricate(:account, username: 'bob') }
before do
sender.follow!(bob, reblogs: true)
@@ -110,7 +110,7 @@ RSpec.describe FollowService, type: :service do
end
describe 'already followed account, turning reblogs on' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:bob) { Fabricate(:account, username: 'bob') }
before do
sender.follow!(bob, reblogs: false)
@@ -124,7 +124,7 @@ RSpec.describe FollowService, type: :service do
end
context 'remote ActivityPub account' do
- let(:bob) { Fabricate(:user, account: Fabricate(:account, username: 'bob', domain: 'example.com', protocol: :activitypub, inbox_url: 'http://example.com/inbox')).account }
+ let(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com', protocol: :activitypub, inbox_url: 'http://example.com/inbox') }
before do
stub_request(:post, "http://example.com/inbox").to_return(:status => 200, :body => "", :headers => {})
diff --git a/spec/services/reject_follow_service_spec.rb b/spec/services/reject_follow_service_spec.rb
index 732cb07f7bcd7e4ba39bb3a819d7a37a1dc4656d..e14bfa78dc80cab9ca0b8e99512615b8afaeb81d 100644
--- a/spec/services/reject_follow_service_spec.rb
+++ b/spec/services/reject_follow_service_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe RejectFollowService, type: :service do
subject { RejectFollowService.new }
describe 'local' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:bob) { Fabricate(:account) }
before do
FollowRequest.create(account: bob, target_account: sender)
@@ -23,7 +23,7 @@ RSpec.describe RejectFollowService, type: :service do
end
describe 'remote ActivityPub' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob', domain: 'example.com', protocol: :activitypub, inbox_url: 'http://example.com/inbox')).account }
+ let(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com', protocol: :activitypub, inbox_url: 'http://example.com/inbox') }
before do
FollowRequest.create(account: bob, target_account: sender)
diff --git a/spec/services/remove_status_service_spec.rb b/spec/services/remove_status_service_spec.rb
index 21fb0cd3531839455bcdc1cee3406e9de51d7a1b..fb7c6b4625cd2a7a0988d059d064dcbe00515522 100644
--- a/spec/services/remove_status_service_spec.rb
+++ b/spec/services/remove_status_service_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
RSpec.describe RemoveStatusService, type: :service do
subject { RemoveStatusService.new }
- let!(:alice) { Fabricate(:account, user: Fabricate(:user)) }
+ let!(:alice) { Fabricate(:account) }
let!(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com') }
let!(:jeff) { Fabricate(:account) }
let!(:hank) { Fabricate(:account, username: 'hank', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
diff --git a/spec/services/report_service_spec.rb b/spec/services/report_service_spec.rb
index 454e4d896fd7116da1fe3913a4cb5c86a7c76252..7e6a113e023466fe59a7d7e24008f3594b295802 100644
--- a/spec/services/report_service_spec.rb
+++ b/spec/services/report_service_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
RSpec.describe ReportService, type: :service do
subject { described_class.new }
- let(:source_account) { Fabricate(:user).account }
+ let(:source_account) { Fabricate(:account) }
context 'for a remote account' do
let(:remote_account) { Fabricate(:account, domain: 'example.com', protocol: :activitypub, inbox_url: 'http://example.com/inbox') }
diff --git a/spec/services/unblock_service_spec.rb b/spec/services/unblock_service_spec.rb
index c43ab24b0309a33419fef6bd4a42bf9a30bf5574..10448b3403263c549c472760ce4e5e1401974ff1 100644
--- a/spec/services/unblock_service_spec.rb
+++ b/spec/services/unblock_service_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe UnblockService, type: :service do
subject { UnblockService.new }
describe 'local' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:bob) { Fabricate(:account) }
before do
sender.block!(bob)
@@ -19,7 +19,7 @@ RSpec.describe UnblockService, type: :service do
end
describe 'remote ActivityPub' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox')).account }
+ let(:bob) { Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
before do
sender.block!(bob)
diff --git a/spec/services/unfollow_service_spec.rb b/spec/services/unfollow_service_spec.rb
index 7f0b575e4d6a99f8e7c80e0f1b15656636eefdab..bb5bef5c91851ccbdbaf94bbe91d6bf602eac1e8 100644
--- a/spec/services/unfollow_service_spec.rb
+++ b/spec/services/unfollow_service_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe UnfollowService, type: :service do
subject { UnfollowService.new }
describe 'local' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:bob) { Fabricate(:account, username: 'bob') }
before do
sender.follow!(bob)
@@ -19,7 +19,7 @@ RSpec.describe UnfollowService, type: :service do
end
describe 'remote ActivityPub' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox')).account }
+ let(:bob) { Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
before do
sender.follow!(bob)
@@ -37,7 +37,7 @@ RSpec.describe UnfollowService, type: :service do
end
describe 'remote ActivityPub (reverse)' do
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox')).account }
+ let(:bob) { Fabricate(:account, username: 'bob', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
before do
bob.follow!(sender)
diff --git a/spec/services/update_account_service_spec.rb b/spec/services/update_account_service_spec.rb
index 960b26891f78780f18f10c3cd8de59dc5738827d..c2dc791e4dc3166d78561399b84d0a747e324ea5 100644
--- a/spec/services/update_account_service_spec.rb
+++ b/spec/services/update_account_service_spec.rb
@@ -5,9 +5,9 @@ RSpec.describe UpdateAccountService, type: :service do
describe 'switching form locked to unlocked accounts' do
let(:account) { Fabricate(:account, locked: true) }
- let(:alice) { Fabricate(:user, email: 'alice@example.com', account: Fabricate(:account, username: 'alice')).account }
- let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
- let(:eve) { Fabricate(:user, email: 'eve@example.com', account: Fabricate(:account, username: 'eve')).account }
+ let(:alice) { Fabricate(:account) }
+ let(:bob) { Fabricate(:account) }
+ let(:eve) { Fabricate(:account) }
before do
bob.touch(:silenced_at)
diff --git a/spec/workers/move_worker_spec.rb b/spec/workers/move_worker_spec.rb
index 82449b0c7e1e26ee435b4d28d8ae62e18e5a774b..4db5810f196db599c6664c1fe14853a15d315979 100644
--- a/spec/workers/move_worker_spec.rb
+++ b/spec/workers/move_worker_spec.rb
@@ -3,9 +3,9 @@
require 'rails_helper'
describe MoveWorker do
- let(:local_follower) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
- let(:blocking_account) { Fabricate(:user, email: 'bar@example.com', account: Fabricate(:account, username: 'bar')).account }
- let(:muting_account) { Fabricate(:user, email: 'foo@example.com', account: Fabricate(:account, username: 'foo')).account }
+ let(:local_follower) { Fabricate(:account) }
+ let(:blocking_account) { Fabricate(:account) }
+ let(:muting_account) { Fabricate(:account) }
let(:source_account) { Fabricate(:account, protocol: :activitypub, domain: 'example.com') }
let(:target_account) { Fabricate(:account, protocol: :activitypub, domain: 'example.com') }
let(:local_user) { Fabricate(:user) }
@@ -88,7 +88,7 @@ describe MoveWorker do
end
context 'target account is local' do
- let(:target_account) { Fabricate(:user, email: 'alice@example.com', account: Fabricate(:account, username: 'alice')).account }
+ let(:target_account) { Fabricate(:account) }
describe 'perform' do
it 'calls UnfollowFollowWorker' do
@@ -102,8 +102,8 @@ describe MoveWorker do
end
context 'both target and source accounts are local' do
- let(:target_account) { Fabricate(:user, email: 'alice@example.com', account: Fabricate(:account, username: 'alice')).account }
- let(:source_account) { Fabricate(:user, email: 'alice_@example.com', account: Fabricate(:account, username: 'alice_')).account }
+ let(:target_account) { Fabricate(:account) }
+ let(:source_account) { Fabricate(:account) }
describe 'perform' do
it 'calls makes local followers follow the target account' do
@@ -115,7 +115,7 @@ describe MoveWorker do
include_examples 'block and mute handling'
it 'does not fail when a local user is already following both accounts' do
- double_follower = Fabricate(:user, email: 'eve@example.com', account: Fabricate(:account, username: 'eve')).account
+ double_follower = Fabricate(:account)
double_follower.follow!(source_account)
double_follower.follow!(target_account)
subject.perform(source_account.id, target_account.id)
diff --git a/spec/workers/unfollow_follow_worker_spec.rb b/spec/workers/unfollow_follow_worker_spec.rb
index 5052c5616a9a4038baaef9df6c61ae2718ac9f9d..5ea4256a9bde075e0832a1368281ee527c5aa1df 100644
--- a/spec/workers/unfollow_follow_worker_spec.rb
+++ b/spec/workers/unfollow_follow_worker_spec.rb
@@ -3,7 +3,7 @@
require 'rails_helper'
describe UnfollowFollowWorker do
- let(:local_follower) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account }
+ let(:local_follower) { Fabricate(:account) }
let(:source_account) { Fabricate(:account) }
let(:target_account) { Fabricate(:account) }
let(:show_reblogs) { true }