Browse Source

Return missing page when tag does not exist (#2563)

master
Matt Jankowski 7 years ago
committed by Eugen Rochko
parent
commit
429480bb77
2 changed files with 7 additions and 1 deletions
  1. +1
    -1
      app/controllers/tags_controller.rb
  2. +6
    -0
      spec/controllers/tags_controller_spec.rb

+ 1
- 1
app/controllers/tags_controller.rb View File

@ -4,7 +4,7 @@ class TagsController < ApplicationController
layout 'public'
def show
@tag = Tag.find_by(name: params[:id].downcase)
@tag = Tag.find_by!(name: params[:id].downcase)
@statuses = @tag.nil? ? [] : Status.as_tag_timeline(@tag, current_account, params[:local]).paginate_by_max_id(20, params[:max_id])
@statuses = cache_collection(@statuses, Status)
end

+ 6
- 0
spec/controllers/tags_controller_spec.rb View File

@ -12,5 +12,11 @@ RSpec.describe TagsController, type: :controller do
get :show, params: { id: 'test' }
expect(response).to have_http_status(:success)
end
it 'returns http missing for non-existent tag' do
get :show, params: { id: 'none' }
expect(response).to have_http_status(:missing)
end
end
end

Loading…
Cancel
Save