From 8bac0350d16cb8e2770c089c91d71f8038404de5 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 19 Apr 2017 07:52:37 -0400 Subject: 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. --- spec/controllers/account_follow_controller_spec.rb | 24 ++++++++++++++++++++++ .../account_unfollow_controller_spec.rb | 24 ++++++++++++++++++++++ spec/controllers/accounts_controller_spec.rb | 14 ------------- .../follower_accounts_controller_spec.rb | 14 +++++++++++++ .../following_accounts_controller_spec.rb | 14 +++++++++++++ 5 files changed, 76 insertions(+), 14 deletions(-) create mode 100644 spec/controllers/account_follow_controller_spec.rb create mode 100644 spec/controllers/account_unfollow_controller_spec.rb create mode 100644 spec/controllers/follower_accounts_controller_spec.rb create mode 100644 spec/controllers/following_accounts_controller_spec.rb (limited to 'spec/controllers') diff --git a/spec/controllers/account_follow_controller_spec.rb b/spec/controllers/account_follow_controller_spec.rb new file mode 100644 index 000000000..479101c67 --- /dev/null +++ b/spec/controllers/account_follow_controller_spec.rb @@ -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 diff --git a/spec/controllers/account_unfollow_controller_spec.rb b/spec/controllers/account_unfollow_controller_spec.rb new file mode 100644 index 000000000..1f28bf4ab --- /dev/null +++ b/spec/controllers/account_unfollow_controller_spec.rb @@ -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 diff --git a/spec/controllers/accounts_controller_spec.rb b/spec/controllers/accounts_controller_spec.rb index d2c93c707..94d10d78f 100644 --- a/spec/controllers/accounts_controller_spec.rb +++ b/spec/controllers/accounts_controller_spec.rb @@ -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 diff --git a/spec/controllers/follower_accounts_controller_spec.rb b/spec/controllers/follower_accounts_controller_spec.rb new file mode 100644 index 000000000..82d2b2067 --- /dev/null +++ b/spec/controllers/follower_accounts_controller_spec.rb @@ -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 diff --git a/spec/controllers/following_accounts_controller_spec.rb b/spec/controllers/following_accounts_controller_spec.rb new file mode 100644 index 000000000..5b5a6fe5f --- /dev/null +++ b/spec/controllers/following_accounts_controller_spec.rb @@ -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 -- cgit