Rename ResolveRemoteAccountService to ResolveAccountService (#6327)
The service used to be named ResolveRemoteAccountService resolves local accounts as well.
This commit is contained in:
parent
17cecd75ca
commit
613e7c7521
17 changed files with 26 additions and 26 deletions
|
@ -30,7 +30,7 @@ describe AuthorizeFollowsController do
|
|||
|
||||
it 'renders error when account cant be found' do
|
||||
service = double
|
||||
allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
|
||||
allow(ResolveAccountService).to receive(:new).and_return(service)
|
||||
allow(service).to receive(:call).with('missing@hostname').and_return(nil)
|
||||
|
||||
get :show, params: { acct: 'acct:missing@hostname' }
|
||||
|
@ -54,7 +54,7 @@ describe AuthorizeFollowsController do
|
|||
it 'sets account from acct uri' do
|
||||
account = Account.new
|
||||
service = double
|
||||
allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
|
||||
allow(ResolveAccountService).to receive(:new).and_return(service)
|
||||
allow(service).to receive(:call).with('found@hostname').and_return(account)
|
||||
|
||||
get :show, params: { acct: 'acct:found@hostname' }
|
||||
|
|
|
@ -17,7 +17,7 @@ RSpec.describe Settings::ImportsController, type: :controller do
|
|||
describe 'POST #create' do
|
||||
it 'redirects to settings path with successful following import' do
|
||||
service = double(call: nil)
|
||||
allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
|
||||
allow(ResolveAccountService).to receive(:new).and_return(service)
|
||||
post :create, params: {
|
||||
import: {
|
||||
type: 'following',
|
||||
|
@ -30,7 +30,7 @@ RSpec.describe Settings::ImportsController, type: :controller do
|
|||
|
||||
it 'redirects to settings path with successful blocking import' do
|
||||
service = double(call: nil)
|
||||
allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
|
||||
allow(ResolveAccountService).to receive(:new).and_return(service)
|
||||
post :create, params: {
|
||||
import: {
|
||||
type: 'blocking',
|
||||
|
|
|
@ -185,8 +185,8 @@ RSpec.describe Account, type: :model do
|
|||
expect(account.refresh!).to be_nil
|
||||
end
|
||||
|
||||
it 'calls not ResolveRemoteAccountService#call' do
|
||||
expect_any_instance_of(ResolveRemoteAccountService).not_to receive(:call).with(acct)
|
||||
it 'calls not ResolveAccountService#call' do
|
||||
expect_any_instance_of(ResolveAccountService).not_to receive(:call).with(acct)
|
||||
account.refresh!
|
||||
end
|
||||
end
|
||||
|
@ -194,8 +194,8 @@ RSpec.describe Account, type: :model do
|
|||
context 'domain is present' do
|
||||
let(:domain) { 'example.com' }
|
||||
|
||||
it 'calls ResolveRemoteAccountService#call' do
|
||||
expect_any_instance_of(ResolveRemoteAccountService).to receive(:call).with(acct).once
|
||||
it 'calls ResolveAccountService#call' do
|
||||
expect_any_instance_of(ResolveAccountService).to receive(:call).with(acct).once
|
||||
account.refresh!
|
||||
end
|
||||
end
|
||||
|
|
|
@ -123,7 +123,7 @@ describe AccountSearchService do
|
|||
describe 'when there is a domain but no exact match' do
|
||||
it 'follows the remote account when resolve is true' do
|
||||
service = double(call: nil)
|
||||
allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
|
||||
allow(ResolveAccountService).to receive(:new).and_return(service)
|
||||
|
||||
results = subject.call('newuser@remote.com', 10, nil, resolve: true)
|
||||
expect(service).to have_received(:call).with('newuser@remote.com')
|
||||
|
@ -131,7 +131,7 @@ describe AccountSearchService do
|
|||
|
||||
it 'does not follow the remote account when resolve is false' do
|
||||
service = double(call: nil)
|
||||
allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
|
||||
allow(ResolveAccountService).to receive(:new).and_return(service)
|
||||
|
||||
results = subject.call('newuser@remote.com', 10, nil, resolve: false)
|
||||
expect(service).not_to have_received(:call)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require 'rails_helper'
|
||||
|
||||
RSpec.describe ResolveRemoteAccountService do
|
||||
RSpec.describe ResolveAccountService do
|
||||
subject { described_class.new }
|
||||
|
||||
before do
|
Loading…
Add table
Add a link
Reference in a new issue