Merge remote-tracking branch 'upstream/pull/4891'

diff --combined test/controllers/diary_entries_controller_test.rb
index 4eeeb2742c9a7e3057f18ce0a8ee655de0f1ce0f,c8548d67b408a3c3e463a70c994354694fde3096..d0453bf08c6bd1b0ffe819918521960010968533
--- 1/test/controllers/diary_entries_controller_test.rb
--- 2/test/controllers/diary_entries_controller_test.rb
+++ b/test/controllers/diary_entries_controller_test.rb
@@@ -81,6 -81,14 +81,6 @@@ class DiaryEntriesControllerTest < Acti
        { :path => "/user/username/diary/1/unhide", :method => :post },
        { :controller => "diary_entries", :action => "unhide", :display_name => "username", :id => "1" }
      )
 -    assert_routing(
 -      { :path => "/user/username/diary/1/hidecomment/2", :method => :post },
 -      { :controller => "diary_entries", :action => "hidecomment", :display_name => "username", :id => "1", :comment => "2" }
 -    )
 -    assert_routing(
 -      { :path => "/user/username/diary/1/unhidecomment/2", :method => :post },
 -      { :controller => "diary_entries", :action => "unhidecomment", :display_name => "username", :id => "1", :comment => "2" }
 -    )
      assert_routing(
        { :path => "/user/username/diary/1/subscribe", :method => :get },
        { :controller => "diary_entries", :action => "subscribe", :display_name => "username", :id => "1" }
@@@ -736,6 -744,17 +736,17 @@@
      end
    end
  
+   def test_show_og_image_with_no_image
+     user = create(:user)
+     diary_entry = create(:diary_entry, :user => user, :body => "nothing")
+ 
+     get diary_entry_path(user, diary_entry)
+     assert_response :success
+     assert_dom "head meta[property='og:image']" do
+       assert_dom "> @content", ActionController::Base.helpers.image_url("osm_logo_256.png", :host => root_url)
+     end
+   end
+ 
    def test_show_og_image
      user = create(:user)
      diary_entry = create(:diary_entry, :user => user, :body => "![some picture](https://example.com/picture.jpg)")
@@@ -758,6 -777,39 +769,39 @@@
      end
    end
  
+   def test_show_og_image_with_spaces
+     user = create(:user)
+     diary_entry = create(:diary_entry, :user => user, :body => "![some picture](https://example.com/the picture.jpg)")
+ 
+     get diary_entry_path(user, diary_entry)
+     assert_response :success
+     assert_dom "head meta[property='og:image']" do
+       assert_dom "> @content", "https://example.com/the%20picture.jpg"
+     end
+   end
+ 
+   def test_show_og_image_with_relative_uri_and_spaces
+     user = create(:user)
+     diary_entry = create(:diary_entry, :user => user, :body => "![some local picture](/the picture.jpg)")
+ 
+     get diary_entry_path(user, diary_entry)
+     assert_response :success
+     assert_dom "head meta[property='og:image']" do
+       assert_dom "> @content", "#{root_url}the%20picture.jpg"
+     end
+   end
+ 
+   def test_show_og_image_with_invalid_uri
+     user = create(:user)
+     diary_entry = create(:diary_entry, :user => user, :body => "![](:)")
+ 
+     get diary_entry_path(user, diary_entry)
+     assert_response :success
+     assert_dom "head meta[property='og:image']" do
+       assert_dom "> @content", ActionController::Base.helpers.image_url("osm_logo_256.png", :host => root_url)
+     end
+   end
+ 
    def test_hide
      user = create(:user)
      diary_entry = create(:diary_entry, :user => user)
@@@ -820,6 -872,70 +864,6 @@@
      assert DiaryEntry.find(diary_entry.id).visible
    end
  
 -  def test_hidecomment
 -    user = create(:user)
 -    diary_entry = create(:diary_entry, :user => user)
 -    diary_comment = create(:diary_comment, :diary_entry => diary_entry)
 -
 -    # Try without logging in
 -    post hide_diary_comment_path(user, diary_entry, diary_comment)
 -    assert_response :forbidden
 -    assert DiaryComment.find(diary_comment.id).visible
 -
 -    # Now try as a normal user
 -    session_for(user)
 -    post hide_diary_comment_path(user, diary_entry, diary_comment)
 -    assert_redirected_to :controller => :errors, :action => :forbidden
 -    assert DiaryComment.find(diary_comment.id).visible
 -
 -    # Try as a moderator
 -    session_for(create(:moderator_user))
 -    post hide_diary_comment_path(user, diary_entry, diary_comment)
 -    assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
 -    assert_not DiaryComment.find(diary_comment.id).visible
 -
 -    # Reset
 -    diary_comment.reload.update(:visible => true)
 -
 -    # Finally try as an administrator
 -    session_for(create(:administrator_user))
 -    post hide_diary_comment_path(user, diary_entry, diary_comment)
 -    assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
 -    assert_not DiaryComment.find(diary_comment.id).visible
 -  end
 -
 -  def test_unhidecomment
 -    user = create(:user)
 -    diary_entry = create(:diary_entry, :user => user)
 -    diary_comment = create(:diary_comment, :diary_entry => diary_entry, :visible => false)
 -
 -    # Try without logging in
 -    post unhide_diary_comment_path(user, diary_entry, diary_comment)
 -    assert_response :forbidden
 -    assert_not DiaryComment.find(diary_comment.id).visible
 -
 -    # Now try as a normal user
 -    session_for(user)
 -    post unhide_diary_comment_path(user, diary_entry, diary_comment)
 -    assert_redirected_to :controller => :errors, :action => :forbidden
 -    assert_not DiaryComment.find(diary_comment.id).visible
 -
 -    # Now try as a moderator
 -    session_for(create(:moderator_user))
 -    post unhide_diary_comment_path(user, diary_entry, diary_comment)
 -    assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
 -    assert DiaryComment.find(diary_comment.id).visible
 -
 -    # Reset
 -    diary_comment.reload.update(:visible => true)
 -
 -    # Finally try as an administrator
 -    session_for(create(:administrator_user))
 -    post unhide_diary_comment_path(user, diary_entry, diary_comment)
 -    assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
 -    assert DiaryComment.find(diary_comment.id).visible
 -  end
 -
    def test_subscribe_page
      user = create(:user)
      other_user = create(:user)