From 2edfdab6e6d70598a19d59f8a2f47ecae8add243 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Fri, 18 Aug 2017 17:42:59 +0900
Subject: [PATCH] Don't send Link header when don't know prev and next links
(#4633)
---
app/controllers/api/base_controller.rb | 2 +-
spec/controllers/api/v1/favourites_controller_spec.rb | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index 6ede63c790..7cfe8fe71c 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -43,7 +43,7 @@ class Api::BaseController < ApplicationController
links = []
links << [next_path, [%w(rel next)]] if next_path
links << [prev_path, [%w(rel prev)]] if prev_path
- response.headers['Link'] = LinkHeader.new(links)
+ response.headers['Link'] = LinkHeader.new(links) unless links.empty?
end
def limit_param(default_limit)
diff --git a/spec/controllers/api/v1/favourites_controller_spec.rb b/spec/controllers/api/v1/favourites_controller_spec.rb
index 3de045377f..46cf70f4d2 100644
--- a/spec/controllers/api/v1/favourites_controller_spec.rb
+++ b/spec/controllers/api/v1/favourites_controller_spec.rb
@@ -70,8 +70,7 @@ RSpec.describe Api::V1::FavouritesController, type: :controller do
it 'does not add pagination headers if not necessary' do
get :index
- expect(response.headers['Link'].find_link(['rel', 'next'])).to eq nil
- expect(response.headers['Link'].find_link(['rel', 'prev'])).to eq nil
+ expect(response.headers['Link']).to eq nil
end
end
end
--
GitLab