tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847)

Browse Source 
Rename Activitypub to ActivityPub
This commit is contained in:
Eugen Rochko
2017-06-19 01:51:04 +02:00
committed by GitHub
parent aebebdc5d1
commit f3be605286
20 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/controllers/api/activitypub/activities_controller_spec.rb
View File

@@ -1,6 +1,6 @@
require 'rails_helper'
RSpec.describe Api::Activitypub::ActivitiesController, type: :controller do
RSpec.describe Api::ActivityPub::ActivitiesController, type: :controller do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }

2
spec/controllers/api/activitypub/notes_controller_spec.rb
View File

@@ -1,6 +1,6 @@
require 'rails_helper'
RSpec.describe Api::Activitypub::NotesController, type: :controller do
RSpec.describe Api::ActivityPub::NotesController, type: :controller do
render_views
let(:user_alice) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }

2
spec/controllers/api/activitypub/outbox_controller_spec.rb
View File

@@ -1,6 +1,6 @@
require 'rails_helper'
RSpec.describe Api::Activitypub::OutboxController, type: :controller do
RSpec.describe Api::ActivityPub::OutboxController, type: :controller do
render_views
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }

4
spec/controllers/authorize_follows_controller_spec.rb
View File

@@ -30,7 +30,7 @@ describe AuthorizeFollowsController do
it 'renders error when account cant be found' do
service = double
allow(FollowRemoteAccountService).to receive(:new).and_return(service)
allow(ResolveRemoteAccountService).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(FollowRemoteAccountService).to receive(:new).and_return(service)
allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
allow(service).to receive(:call).with('found@hostname').and_return(account)
get :show, params: { acct: 'acct:found@hostname' }

4
spec/controllers/settings/imports_controller_spec.rb
View File

@@ -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(FollowRemoteAccountService).to receive(:new).and_return(service)
allow(ResolveRemoteAccountService).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(FollowRemoteAccountService).to receive(:new).and_return(service)
allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
post :create, params: {
import: {
type: 'blocking',