Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: render canonical URLs

This commit is contained in:
Sam 2015-09-22 09:37:23 +10:00
parent 4f7140fb32
commit a0524ea4d1
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/topics_controller.rb
View File

@ -83,9 +83,10 @@ class TopicsController < ApplicationController
response.headers['X-Robots-Tag'] = 'noindex' response.headers['X-Robots-Tag'] = 'noindex'
end end
canonical_url UrlHelper.absolute_without_cdn("#{Discourse.base_uri}#{@topic_view.canonical_path}")
perform_show_response perform_show_response
canonical_url UrlHelper.absolute_without_cdn("#{Discourse.base_uri}#{@topic_view.canonical_path}")
rescue Discourse::InvalidAccess => ex rescue Discourse::InvalidAccess => ex
if current_user if current_user

11
spec/controllers/topics_controller_spec.rb
View File

@ -521,6 +521,17 @@ describe TopicsController do
end end
end end
describe 'show full render' do
render_views
it 'correctly renders canoicals' do
topic = Fabricate(:post).topic
get :show, topic_id: topic.id, slug: topic.slug
expect(response).to be_success
expect(css_select("link[rel=canonical]").length).to eq(1)
end
end
describe 'show' do describe 'show' do
let(:topic) { Fabricate(:post).topic } let(:topic) { Fabricate(:post).topic }