maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add canonical url to posts even if internal nav (#5227) [deploy]

Browse source 
* Add canonical url to posts even if internal nav

* Render to meta if not internal
This commit is contained in:
Ben Halpern 2019-12-27 10:58:23 -05:00 • committed by GitHub
parent 2312d2e301
commit 7a867d6133
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/views/articles/show.html.erb
View file

@ -36,13 +36,11 @@
<% end %>
<% end %>
<% if !internal_navigation? %>
<% if internal_navigation? %>
<link rel="canonical" href="<%= @article.canonical_url.presence || "https://#{ApplicationConfig['APP_DOMAIN']}#{@article.path}" %>" />
<% else %>
<%= content_for :page_meta do %>
<% if @article.canonical_url.present? %>
<link rel="canonical" href="<%= @article.canonical_url %>" />
<% else %>
<link rel="canonical" href="https://dev.to<%= @article.path %>" />
<% end %>
<link rel="canonical" href="<%= @article.canonical_url.presence || "https://#{ApplicationConfig['APP_DOMAIN']}#{@article.path}" %>" />
<meta name="description" content="<%= @article.description || "An article from the community" %>">
<meta name="keywords" content="software development, inclusive, community, engineering, <%= @article.cached_tag_list %>">

12
spec/requests/stories_show_spec.rb
View file

@ -107,6 +107,18 @@ RSpec.describe "StoriesShow", type: :request do
get "/#{middle_username}/#{article.slug}"
expect(response.body).to redirect_to("/#{user.username}/#{article.slug}")
end
it "renders canonical url when exists" do
article = create(:article, with_canonical_url: true)
get article.path
expect(response.body).to include('"canonical" href="' + article.canonical_url.to_s + '"')
end
it "shodoes not render canonical url when not on article model" do
article = create(:article, with_canonical_url: false)
get article.path
expect(response.body).not_to include('"canonical" href="' + article.canonical_url.to_s + '"')
end
end
describe "GET /:username (org)" do