Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2 files changed, 72 insertions, 18 deletions

diff --git a/spec/controllers/follower_accounts_controller_spec.rb b/spec/controllers/follower_accounts_controller_spec.rb
index 3a42a6e18..83032ab64 100644
--- a/spec/controllers/follower_accounts_controller_spec.rb
+++ b/spec/controllers/follower_accounts_controller_spec.rb
@@ -8,18 +8,45 @@ describe FollowerAccountsController do
   let(:follower1) { Fabricate(:account) }
 
   describe 'GET #index' do
-    it 'assigns follows' do
-      follow0 = follower0.follow!(alice)
-      follow1 = follower1.follow!(alice)
+    let!(:follow0) { follower0.follow!(alice) }
+    let!(:follow1) { follower1.follow!(alice) }
 
-      get :index, params: { account_username: alice.username }
+    context 'when format is html' do
+      subject(:response) { get :index, params: { account_username: alice.username, format: :html } }
 
-      assigned = assigns(:follows).to_a
-      expect(assigned.size).to eq 2
-      expect(assigned[0]).to eq follow1
-      expect(assigned[1]).to eq follow0
+      it 'assigns follows' do
+        expect(response).to have_http_status(200)
 
-      expect(response).to have_http_status(200)
+        assigned = assigns(:follows).to_a
+        expect(assigned.size).to eq 2
+        expect(assigned[0]).to eq follow1
+        expect(assigned[1]).to eq follow0
+      end
+    end
+
+    context 'when format is json' do
+      subject(:response) { get :index, params: { account_username: alice.username, page: page, format: :json } }
+      subject(:body) { JSON.parse(response.body) }
+
+      context 'with page' do
+        let(:page) { 1 }
+
+        it 'returns followers' do
+          expect(response).to have_http_status(200)
+          expect(body['totalItems']).to eq 2
+          expect(body['partOf']).to be_present
+        end
+      end
+
+      context 'without page' do
+        let(:page) { nil }
+
+        it 'returns followers' do
+          expect(response).to have_http_status(200)
+          expect(body['totalItems']).to eq 2
+          expect(body['partOf']).to be_blank
+        end
+      end
     end
   end
 end
diff --git a/spec/controllers/following_accounts_controller_spec.rb b/spec/controllers/following_accounts_controller_spec.rb
index 33376365d..d5e4ee587 100644
--- a/spec/controllers/following_accounts_controller_spec.rb
+++ b/spec/controllers/following_accounts_controller_spec.rb
@@ -8,18 +8,45 @@ describe FollowingAccountsController do
   let(:followee1) { Fabricate(:account) }
 
   describe 'GET #index' do
-    it 'assigns followees' do
-      follow0 = alice.follow!(followee0)
-      follow1 = alice.follow!(followee1)
+    let!(:follow0) { alice.follow!(followee0) }
+    let!(:follow1) { alice.follow!(followee1) }
 
-      get :index, params: { account_username: alice.username }
+    context 'when format is html' do
+      subject(:response) { get :index, params: { account_username: alice.username, format: :html } }
 
-      assigned = assigns(:follows).to_a
-      expect(assigned.size).to eq 2
-      expect(assigned[0]).to eq follow1
-      expect(assigned[1]).to eq follow0
+      it 'assigns follows' do
+        expect(response).to have_http_status(200)
 
-      expect(response).to have_http_status(200)
+        assigned = assigns(:follows).to_a
+        expect(assigned.size).to eq 2
+        expect(assigned[0]).to eq follow1
+        expect(assigned[1]).to eq follow0
+      end
+    end
+
+    context 'when format is json' do
+      subject(:response) { get :index, params: { account_username: alice.username, page: page, format: :json } }
+      subject(:body) { JSON.parse(response.body) }
+
+      context 'with page' do
+        let(:page) { 1 }
+
+        it 'returns followers' do
+          expect(response).to have_http_status(200)
+          expect(body['totalItems']).to eq 2
+          expect(body['partOf']).to be_present
+        end
+      end
+
+      context 'without page' do
+        let(:page) { nil }
+
+        it 'returns followers' do
+          expect(response).to have_http_status(200)
+          expect(body['totalItems']).to eq 2
+          expect(body['partOf']).to be_blank
+        end
+      end
     end
   end
 end