diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-11 23:50:37 +0200 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-09-16 11:10:33 -0500 |
commit | ad8e856a5b053096e32debdc12ce9c6d05924657 (patch) | |
tree | 23478c6ecdc63633c7216de205e0d1322ae4a351 /spec/controllers/api | |
parent | 7ebd6ed03cb643df2485aadfec31845f829d0a64 (diff) |
Fix error when following locked accounts (#4896)
(cherry picked from commit 0ef9d45d0581dddf2f325033c43721f42fcfca9e)
Diffstat (limited to 'spec/controllers/api')
-rw-r--r-- | spec/controllers/api/v1/accounts_controller_spec.rb | 43 |
1 files changed, 33 insertions, 10 deletions
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb index 96e8ecd43..053c53e5a 100644 --- a/spec/controllers/api/v1/accounts_controller_spec.rb +++ b/spec/controllers/api/v1/accounts_controller_spec.rb @@ -18,25 +18,48 @@ RSpec.describe Api::V1::AccountsController, type: :controller do end describe 'POST #follow' do - let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account } + let(:other_account) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob', locked: locked)).account } before do post :follow, params: { id: other_account.id } end - it 'returns http success' do - expect(response).to have_http_status(:success) - end + context 'with unlocked account' do + let(:locked) { false } + + it 'returns http success' do + expect(response).to have_http_status(:success) + end + + it 'returns JSON with following=true and requested=false' do + json = body_as_json - it 'returns JSON with following=true and requested=false' do - json = body_as_json + expect(json[:following]).to be true + expect(json[:requested]).to be false + end - expect(json[:following]).to be true - expect(json[:requested]).to be false + it 'creates a following relation between user and target user' do + expect(user.account.following?(other_account)).to be true + end end - it 'creates a following relation between user and target user' do - expect(user.account.following?(other_account)).to be true + context 'with locked account' do + let(:locked) { true } + + it 'returns http success' do + expect(response).to have_http_status(:success) + end + + it 'returns JSON with following=false and requested=true' do + json = body_as_json + + expect(json[:following]).to be false + expect(json[:requested]).to be true + end + + it 'creates a follow request relation between user and target user' do + expect(user.account.requested?(other_account)).to be true + end end end |