Return API pagination links as headers rather than in the response body itself

12 files changed, 21 insertions, 37 deletions

diff --git a/spec/integration/api/aspects_controller_spec.rb b/spec/integration/api/aspects_controller_spec.rb
index 2a948b2c4..c255f7a76 100644
--- a/spec/integration/api/aspects_controller_spec.rb
+++ b/spec/integration/api/aspects_controller_spec.rb
@@ -342,6 +342,6 @@ describe Api::V1::AspectsController do
   end
 
   def response_body_data(response)
-    JSON.parse(response.body)["data"]
+    JSON.parse(response.body)
   end
 end
diff --git a/spec/integration/api/comments_controller_spec.rb b/spec/integration/api/comments_controller_spec.rb
index fd4eb2b1a..41befd84c 100644
--- a/spec/integration/api/comments_controller_spec.rb
+++ b/spec/integration/api/comments_controller_spec.rb
@@ -139,7 +139,7 @@ describe Api::V1::CommentsController do
           params: {access_token: access_token_minimum_scopes}
         )
         expect(response.status).to eq(200)
-        comments = response_body_data(response)
+        comments = response_body(response)
         expect(comments.length).to eq(2)
         confirm_comment_format(comments[0], auth.user, @comment_text1)
         confirm_comment_format(comments[1], auth.user, @comment_text2)
@@ -435,10 +435,6 @@ describe Api::V1::CommentsController do
     JSON.parse(response.body)
   end
 
-  def response_body_data(response)
-    JSON.parse(response.body)["data"]
-  end
-
   private
 
   # rubocop:disable Metrics/AbcSize
diff --git a/spec/integration/api/contacts_controller_spec.rb b/spec/integration/api/contacts_controller_spec.rb
index cef791c03..faabb41d0 100644
--- a/spec/integration/api/contacts_controller_spec.rb
+++ b/spec/integration/api/contacts_controller_spec.rb
@@ -252,7 +252,7 @@ describe Api::V1::ContactsController do
   end
 
   def response_body_data(response)
-    JSON.parse(response.body)["data"]
+    JSON.parse(response.body)
   end
 
   def aspects_membership_service(user=auth.user)
diff --git a/spec/integration/api/conversations_controller_spec.rb b/spec/integration/api/conversations_controller_spec.rb
index 5addd1dc3..c88d53cda 100644
--- a/spec/integration/api/conversations_controller_spec.rb
+++ b/spec/integration/api/conversations_controller_spec.rb
@@ -165,7 +165,7 @@ describe Api::V1::ConversationsController do
     it "returns all the user conversations" do
       get api_v1_conversations_path, params: {access_token: access_token}
       expect(response.status).to eq(200)
-      returned_conversations = response_body_data(response)
+      returned_conversations = response_body(response)
       expect(returned_conversations.length).to eq(3)
       actual_conversation = returned_conversations.select {|c| c["guid"] == @read_conversation_guid }[0]
       confirm_conversation_format(actual_conversation, @read_conversation, [auth.user, alice])
@@ -179,7 +179,7 @@ describe Api::V1::ConversationsController do
         params: {only_unread: true, access_token: access_token}
       )
       expect(response.status).to eq(200)
-      expect(response_body_data(response).length).to eq(2)
+      expect(response_body(response).length).to eq(2)
     end
 
     it "returns all the user conversations after a given date" do
@@ -188,7 +188,7 @@ describe Api::V1::ConversationsController do
         params: {only_after: @date, access_token: access_token}
       )
       expect(response.status).to eq(200)
-      expect(response_body_data(response).length).to eq(1)
+      expect(response_body(response).length).to eq(1)
     end
 
     context "with improper credentials" do
@@ -366,10 +366,6 @@ describe Api::V1::ConversationsController do
     JSON.parse(response.body)
   end
 
-  def response_body_data(response)
-    JSON.parse(response.body)["data"]
-  end
-
   # rubocop:disable Metrics/AbcSize
   def confirm_conversation_format(conversation, ref_conversation, ref_participants)
     expect(conversation["guid"]).to_not be_nil
diff --git a/spec/integration/api/likes_controller_spec.rb b/spec/integration/api/likes_controller_spec.rb
index 615a24b34..b462ef27b 100644
--- a/spec/integration/api/likes_controller_spec.rb
+++ b/spec/integration/api/likes_controller_spec.rb
@@ -56,7 +56,7 @@ describe Api::V1::LikesController do
           params: {access_token: access_token_minimum_scopes}
         )
         expect(response.status).to eq(200)
-        likes = response_body_data(response)
+        likes = response_body(response)
         expect(likes.length).to eq(0)
       end
 
@@ -69,7 +69,7 @@ describe Api::V1::LikesController do
           params: {access_token: access_token_minimum_scopes}
         )
         expect(response.status).to eq(200)
-        likes = response_body_data(response)
+        likes = response_body(response)
         expect(likes.length).to eq(3)
         confirm_like_format(likes, alice)
         confirm_like_format(likes, bob)
@@ -278,8 +278,4 @@ describe Api::V1::LikesController do
   def response_body(response)
     JSON.parse(response.body)
   end
-
-  def response_body_data(response)
-    JSON.parse(response.body)["data"]
-  end
 end
diff --git a/spec/integration/api/messages_controller_spec.rb b/spec/integration/api/messages_controller_spec.rb
index 72524c6cc..3fc365146 100644
--- a/spec/integration/api/messages_controller_spec.rb
+++ b/spec/integration/api/messages_controller_spec.rb
@@ -161,7 +161,7 @@ describe Api::V1::MessagesController do
   private
 
   def response_body_data(response)
-    JSON.parse(response.body)["data"]
+    JSON.parse(response.body)
   end
 
   def get_conversation(conversation_id)
diff --git a/spec/integration/api/notifications_controller_spec.rb b/spec/integration/api/notifications_controller_spec.rb
index 999c6515b..6c685537c 100644
--- a/spec/integration/api/notifications_controller_spec.rb
+++ b/spec/integration/api/notifications_controller_spec.rb
@@ -227,7 +227,7 @@ describe Api::V1::NotificationsController do
   private
 
   def response_body_data(response)
-    JSON.parse(response.body)["data"]
+    JSON.parse(response.body)
   end
 
   # rubocop:disable Metrics/AbcSize
diff --git a/spec/integration/api/photos_controller_spec.rb b/spec/integration/api/photos_controller_spec.rb
index c945e7dfe..48f5837c7 100644
--- a/spec/integration/api/photos_controller_spec.rb
+++ b/spec/integration/api/photos_controller_spec.rb
@@ -363,7 +363,7 @@ describe Api::V1::PhotosController do
   end
 
   def response_body_data(response)
-    response_body(response)["data"]
+    response_body(response)
   end
 
   # rubocop:disable Metrics/AbcSize
diff --git a/spec/integration/api/reshares_controller_spec.rb b/spec/integration/api/reshares_controller_spec.rb
index 2bf324f6c..5f3cd7c79 100644
--- a/spec/integration/api/reshares_controller_spec.rb
+++ b/spec/integration/api/reshares_controller_spec.rb
@@ -220,7 +220,7 @@ describe Api::V1::ResharesController do
   end
 
   def response_body_data(response)
-    JSON.parse(response.body)["data"]
+    JSON.parse(response.body)
   end
 
   # rubocop:disable Metrics/AbcSize
diff --git a/spec/integration/api/search_controller_spec.rb b/spec/integration/api/search_controller_spec.rb
index f8301637f..cc22f457a 100644
--- a/spec/integration/api/search_controller_spec.rb
+++ b/spec/integration/api/search_controller_spec.rb
@@ -224,6 +224,6 @@ describe Api::V1::SearchController do
   end
 
   def response_body_data(response)
-    JSON.parse(response.body)["data"]
+    JSON.parse(response.body)
   end
 end
diff --git a/spec/integration/api/streams_controller_spec.rb b/spec/integration/api/streams_controller_spec.rb
index 750a56954..5a88b53fb 100644
--- a/spec/integration/api/streams_controller_spec.rb
+++ b/spec/integration/api/streams_controller_spec.rb
@@ -474,7 +474,7 @@ describe Api::V1::StreamsController do
   # rubocop:enable Metrics/AbcSize
 
   def response_body_data(response)
-    JSON.parse(response.body)["data"]
+    JSON.parse(response.body)
   end
 
   def add_tag(name, user)
diff --git a/spec/integration/api/users_controller_spec.rb b/spec/integration/api/users_controller_spec.rb
index 18bd15c01..23a2ae32d 100644
--- a/spec/integration/api/users_controller_spec.rb
+++ b/spec/integration/api/users_controller_spec.rb
@@ -316,7 +316,7 @@ describe Api::V1::UsersController do
         params: {access_token: access_token}
       )
       expect(response.status).to eq(200)
-      contacts = response_body_data(response)
+      contacts = response_body(response)
       expect(contacts.length).to eq(0)
 
       aspect = auth.user.aspects.create(name: "first")
@@ -326,7 +326,7 @@ describe Api::V1::UsersController do
         params: {access_token: access_token}
       )
       expect(response.status).to eq(200)
-      contacts = response_body_data(response)
+      contacts = response_body(response)
       expect(contacts.length).to eq(1)
       confirm_person_format(contacts[0], alice)
 
@@ -391,7 +391,7 @@ describe Api::V1::UsersController do
           params: {access_token: access_token}
         )
         expect(response.status).to eq(200)
-        photos = response_body_data(response)
+        photos = response_body(response)
         expect(photos.length).to eq(3)
         guids = photos.map {|photo| photo["guid"] }
         expect(guids).to include(@public_photo1.guid, @public_photo2.guid, @shared_photo1.guid)
@@ -407,7 +407,7 @@ describe Api::V1::UsersController do
           params: {access_token: access_token_public_only_read_only}
         )
         expect(response.status).to eq(200)
-        photos = response_body_data(response)
+        photos = response_body(response)
         expect(photos.length).to eq(2)
         guids = photos.map {|photo| photo["guid"] }
         expect(guids).to include(@public_photo1.guid, @public_photo2.guid)
@@ -467,7 +467,7 @@ describe Api::V1::UsersController do
           params: {access_token: access_token}
         )
         expect(response.status).to eq(200)
-        posts = response_body_data(response)
+        posts = response_body(response)
         expect(posts.length).to eq(3)
         guids = posts.map {|post| post["guid"] }
         expect(guids).to include(@public_post1.guid, @public_post2.guid, @shared_post1.guid)
@@ -484,7 +484,7 @@ describe Api::V1::UsersController do
           params: {access_token: access_token}
         )
         expect(response.status).to eq(200)
-        posts = response_body_data(response)
+        posts = response_body(response)
         expect(posts.length).to eq(3)
       end
 
@@ -494,7 +494,7 @@ describe Api::V1::UsersController do
           params: {access_token: access_token_public_only_read_only}
         )
         expect(response.status).to eq(200)
-        posts = response_body_data(response)
+        posts = response_body(response)
         expect(posts.length).to eq(2)
       end
     end
@@ -605,8 +605,4 @@ describe Api::V1::UsersController do
   def response_body(response)
     JSON.parse(response.body)
   end
-
-  def response_body_data(response)
-    response_body(response)["data"]
-  end
 end