LenPayne/mastodon
1
0
Fork 0
forked from cybrespace/mastodon
Code Issues Pull requests Releases Wiki Activity

Don't send Link header when don't know prev and next links (#4633)

Browse source
This commit is contained in:
Yamagishi Kazutoshi 2017-08-18 17:42:59 +09:00 • committed by Eugen Rochko
parent 4edf9d849f
commit 2edfdab6e6
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/base_controller.rb
View file

@ -43,7 +43,7 @@ class Api::BaseController < ApplicationController
links = [] links = []
links << [next_path, [%w(rel next)]] if next_path links << [next_path, [%w(rel next)]] if next_path
links << [prev_path, [%w(rel prev)]] if prev_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 end
def limit_param(default_limit) def limit_param(default_limit)

3
spec/controllers/api/v1/favourites_controller_spec.rb
View file

@ -70,8 +70,7 @@ RSpec.describe Api::V1::FavouritesController, type: :controller do
it 'does not add pagination headers if not necessary' do it 'does not add pagination headers if not necessary' do
get :index get :index
expect(response.headers['Link'].find_link(['rel', 'next'])).to eq nil expect(response.headers['Link']).to eq nil
expect(response.headers['Link'].find_link(['rel', 'prev'])).to eq nil
end end
end end
end end