Restful refactor of accounts/ routes (#2133)

* Add routing specs for accounts followers and following actions

* Use more restful route naming for public account follow pages

Moves two actions:
- accounts#followers to accounts/follower_accounts#index
- accounts#following to accounts/following_accounts#index

Adds routing spec to ensure prior URLs are preserved.
This commit is contained in:
Matt Jankowski 2017-04-19 07:52:37 -04:00 committed by Eugen
parent c0b30c56db
commit 8bac0350d1
18 changed files with 275 additions and 63 deletions

View file

@ -0,0 +1,24 @@
require 'rails_helper'
describe AccountFollowController do
render_views
let(:user) { Fabricate(:user) }
let(:alice) { Fabricate(:account, username: 'alice') }
describe 'POST #create' do
before do
sign_in(user)
end
it 'redirects to account path' do
service = double
allow(FollowService).to receive(:new).and_return(service)
allow(service).to receive(:call)
post :create, params: { account_username: alice.username }
expect(service).to have_received(:call).with(user.account, 'alice')
expect(response).to redirect_to(account_path(alice))
end
end
end

View file

@ -0,0 +1,24 @@
require 'rails_helper'
describe AccountUnfollowController do
render_views
let(:user) { Fabricate(:user) }
let(:alice) { Fabricate(:account, username: 'alice') }
describe 'POST #create' do
before do
sign_in(user)
end
it 'redirects to account path' do
service = double
allow(UnfollowService).to receive(:new).and_return(service)
allow(service).to receive(:call)
post :create, params: { account_username: alice.username }
expect(service).to have_received(:call).with(user.account, alice)
expect(response).to redirect_to(account_path(alice))
end
end
end

View file

@ -44,18 +44,4 @@ RSpec.describe AccountsController, type: :controller do
end
end
end
describe 'GET #followers' do
it 'returns http success' do
get :followers, params: { username: alice.username }
expect(response).to have_http_status(:success)
end
end
describe 'GET #following' do
it 'returns http success' do
get :following, params: { username: alice.username }
expect(response).to have_http_status(:success)
end
end
end

View file

@ -0,0 +1,14 @@
require 'rails_helper'
describe FollowerAccountsController do
render_views
let(:alice) { Fabricate(:account, username: 'alice') }
describe 'GET #index' do
it 'returns http success' do
get :index, params: { account_username: alice.username }
expect(response).to have_http_status(:success)
end
end
end

View file

@ -0,0 +1,14 @@
require 'rails_helper'
describe FollowingAccountsController do
render_views
let(:alice) { Fabricate(:account, username: 'alice') }
describe 'GET #index' do
it 'returns http success' do
get :index, params: { account_username: alice.username }
expect(response).to have_http_status(:success)
end
end
end

View file

@ -0,0 +1,33 @@
# frozen_string_literal: true
require 'rails_helper'
describe 'Link headers' do
describe 'on the account show page' do
let(:account) { Fabricate(:account, username: 'test') }
before do
get short_account_path(username: account)
end
it 'contains webfinger url in link header' do
link_header = link_header_with_type('application/xrd+xml')
expect(link_header.href).to match 'http://www.example.com/.well-known/webfinger?resource=acct%3Atest%40cb6e6126.ngrok.io'
expect(link_header.attr_pairs.first).to eq %w[rel lrdd]
end
it 'contains atom url in link header' do
link_header = link_header_with_type('application/atom+xml')
expect(link_header.href).to eq 'http://www.example.com/users/test.atom'
expect(link_header.attr_pairs.first).to eq %w[rel alternate]
end
def link_header_with_type(type)
response.headers['Link'].links.find do |link|
link.attr_pairs.any? { |pair| pair == ['type', type] }
end
end
end
end

View file

@ -0,0 +1,31 @@
require 'rails_helper'
describe 'Routes under accounts/' do
describe 'the route for accounts who are followers of an account' do
it 'routes to the followers action with the right username' do
expect(get('/users/name/followers')).
to route_to('follower_accounts#index', account_username: 'name')
end
end
describe 'the route for accounts who are followed by an account' do
it 'routes to the following action with the right username' do
expect(get('/users/name/following')).
to route_to('following_accounts#index', account_username: 'name')
end
end
describe 'the route for following an account' do
it 'routes to the follow create action with the right username' do
expect(post('/users/name/follow')).
to route_to('account_follow#create', account_username: 'name')
end
end
describe 'the route for unfollowing an account' do
it 'routes to the unfollow create action with the right username' do
expect(post('/users/name/unfollow')).
to route_to('account_unfollow#create', account_username: 'name')
end
end
end