about summary refs log tree commit diff
path: root/spec/controllers
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-09-11 23:50:37 +0200
committerGitHub <noreply@github.com>2017-09-11 23:50:37 +0200
commit0ef9d45d0581dddf2f325033c43721f42fcfca9e (patch)
tree305aa87274cc4a045f6df4b95dcce7a4f7eea238 /spec/controllers
parenta6a206ef850da46a1fbdf262fe4527a44f2ceb0f (diff)
Fix error when following locked accounts (#4896)
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/api/v1/accounts_controller_spec.rb43
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 05df2f844..c770649ec 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